diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-12 11:21:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-12 11:21:24 -0700 |
| commit | 3b4334e200ba50cd02e53b122ef56214b170ea23 (patch) | |
| tree | 22a81bce0bf2ebd189ea8f5c7f7d0fbfc78a9a01 /drivers/input/ff-memless.c | |
| parent | 34fd5dad46fc494c6ed3b174b2c991ea9961ebe9 (diff) | |
| parent | 705a76d2d22a2824f45f07d023a380293554e989 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: tsc2007 - fix locking in hrtimer handler
Input: atkbd - add force release keys quirk for Amilo Xi 3650
Input: ff-memless - fix signed to unsigned bit overflow
Input: joydev - blacklist digitizers
Diffstat (limited to 'drivers/input/ff-memless.c')
| -rw-r--r-- | drivers/input/ff-memless.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c index bc4e40f3ede7..2d1415e16834 100644 --- 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; |