diff options
Diffstat (limited to 'drivers/input/ff-memless.c')
-rw-r--r-- | drivers/input/ff-memless.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c index 5f558851d646..b107922514fb 100644 --- a/drivers/input/ff-memless.c +++ b/drivers/input/ff-memless.c | |||
@@ -176,7 +176,7 @@ static int apply_envelope(struct ml_effect_state *state, int value, | |||
176 | value, envelope->attack_level); | 176 | value, envelope->attack_level); |
177 | time_from_level = jiffies_to_msecs(now - state->play_at); | 177 | time_from_level = jiffies_to_msecs(now - state->play_at); |
178 | time_of_envelope = envelope->attack_length; | 178 | time_of_envelope = envelope->attack_length; |
179 | envelope_level = min_t(__s16, envelope->attack_level, 0x7fff); | 179 | envelope_level = min_t(u16, envelope->attack_level, 0x7fff); |
180 | 180 | ||
181 | } else if (envelope->fade_length && effect->replay.length && | 181 | } else if (envelope->fade_length && effect->replay.length && |
182 | time_after(now, | 182 | time_after(now, |
@@ -184,7 +184,7 @@ static int apply_envelope(struct ml_effect_state *state, int value, | |||
184 | time_before(now, state->stop_at)) { | 184 | time_before(now, state->stop_at)) { |
185 | time_from_level = jiffies_to_msecs(state->stop_at - now); | 185 | time_from_level = jiffies_to_msecs(state->stop_at - now); |
186 | time_of_envelope = envelope->fade_length; | 186 | time_of_envelope = envelope->fade_length; |
187 | envelope_level = min_t(__s16, envelope->fade_level, 0x7fff); | 187 | envelope_level = min_t(u16, envelope->fade_level, 0x7fff); |
188 | } else | 188 | } else |
189 | return value; | 189 | return value; |
190 | 190 | ||