---

yaml --- r: 318321 b: refs/heads/master c: 9a93214 h: refs/heads/master i: 318319: 018e027 v: v3
git-mirror · Jul 8, 2012 · 7ccaa57 · 7ccaa57
1 parent bb8548e
commit 7ccaa57
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6bd9d465500effa710634876fa9e35581da522d
+refs/heads/master: 9a932145f2d57bad1092ba006dee9065adc5eb39
diff --git a/trunk/drivers/input/ff-memless.c b/trunk/drivers/input/ff-memless.c
@@ -176,15 +176,15 @@ 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,
 			      state->stop_at - msecs_to_jiffies(envelope->fade_length)) &&
 		   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;