Input: ff-memless - fix a couple min_t() casts

PATCH New Dan Carpenter 1 participant 1 message Sep 26, 2011

Subsystems (3)

Kernel janitors HID Input drivers

lore

Share & tools

lore

Dan Carpenter

author

2011-09-26 06:16 UTC #0 lore raw

PATCH 1/1 Input: ff-memless - fix a couple min_t() casts

envelope->attack_level is a u16 type. We're trying to clamp it here so it's between 0 and 0x7fff. Unfortunately, the cast to __s16 turns all the values larger than 0x7fff into negative numbers and min_t() thinks they are less than 0x7fff. envelope_level is an int so now we've got negative values stored there.

Signed-off-by Dan Carpenter <[email protected]>

drivers/input/ff-memless.c +2 -2

index 117a59a..4d2aa41 100644
@@ -177,7 +177,7 @@ static int apply_envelope(struct ml_effect_state *state, int value,
 			 value, envelope->attack_level);
 		time_from_level = jiffies_to_msecs(now - state->play_at);
 		time_of_envelope = envelope->attack_length;
-		envelope_level = min_t(__s16, envelope->attack_level, 0x7fff);
+		envelope_level = min_t(u16, envelope->attack_level, 0x7fff);
 
 	} else if (envelope->fade_length && effect->replay.length &&
 		   time_after(now,

@@ -185,7 +185,7 @@ static int apply_envelope(struct ml_effect_state *state, int value,
 		   time_before(now, state->stop_at)) {
 		time_from_level = jiffies_to_msecs(state->stop_at - now);
 		time_of_envelope = envelope->fade_length;
-		envelope_level = min_t(__s16, envelope->fade_level, 0x7fff);
+		envelope_level = min_t(u16, envelope->fade_level, 0x7fff);
 	} else
 		return value;