git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
[sfrench/cifs-2.6.git]
/
drivers
/
input
/
ff-memless.c
diff --git
a/drivers/input/ff-memless.c
b/drivers/input/ff-memless.c
index bc4e40f3ede7303d97816a6cbf8588c8f22118d2..2d1415e1683467ae55de53ba3fb273996ba7a795 100644
(file)
--- a/
drivers/input/ff-memless.c
+++ b/
drivers/input/ff-memless.c
@@
-226,7
+226,7
@@
static int get_compatible_type(struct ff_device *ff, int effect_type)
*/
static void ml_combine_effects(struct ff_effect *effect,
struct ml_effect_state *state,
- int gain)
+
unsigned
int gain)
{
struct ff_effect *new = state->effect;
unsigned int strong, weak, i;