From 101a08d898410b4fc3d8a1c9cdb39d39c2f84a8b Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Thu, 24 Dec 2009 21:44:19 -0800 Subject: [PATCH] --- yaml --- r: 178652 b: refs/heads/master c: 1b11c88d3e8f55dc9d193d19de11e3f7abc1b7d7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/ff-memless.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 293136c8256a..518e9d5d9d45 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25ae08317647c68ed9276f7bdc07d0d5fd042628 +refs/heads/master: 1b11c88d3e8f55dc9d193d19de11e3f7abc1b7d7 diff --git a/trunk/drivers/input/ff-memless.c b/trunk/drivers/input/ff-memless.c index decc51f45bfd..9667a5fd6bd7 100644 --- a/trunk/drivers/input/ff-memless.c +++ b/trunk/drivers/input/ff-memless.c @@ -225,7 +225,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, - unsigned int gain) + int gain) { struct ff_effect *new = state->effect; unsigned int strong, weak, i; @@ -252,8 +252,8 @@ static void ml_combine_effects(struct ff_effect *effect, break; case FF_RUMBLE: - strong = new->u.rumble.strong_magnitude * gain / 0xffff; - weak = new->u.rumble.weak_magnitude * gain / 0xffff; + strong = (u32)new->u.rumble.strong_magnitude * gain / 0xffff; + weak = (u32)new->u.rumble.weak_magnitude * gain / 0xffff; effect->u.rumble.strong_magnitude = min(strong + effect->u.rumble.strong_magnitude, 0xffffU);