From 7ccaa573595a8e341a11490b8299af86d2ff12b3 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 7 Jul 2012 18:17:54 -0700 Subject: [PATCH] --- yaml --- r: 318321 b: refs/heads/master c: 9a932145f2d57bad1092ba006dee9065adc5eb39 h: refs/heads/master i: 318319: 018e0272fd4d9bde0b97cad1965f74dead64ded4 v: v3 --- [refs] | 2 +- trunk/drivers/input/ff-memless.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 94d6deb8d802..27e460b86afd 100644 --- 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 index 5f558851d646..b107922514fb 100644 --- a/trunk/drivers/input/ff-memless.c +++ b/trunk/drivers/input/ff-memless.c @@ -176,7 +176,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, @@ -184,7 +184,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;