diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-29 05:46:10 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-29 05:46:10 -0400 |
| commit | e93721a70263afefbac781f575bfe851c6f95d84 (patch) | |
| tree | ab359f12a0688802aa99339bae82c51763dae9f6 /drivers/input/ff-memless.c | |
| parent | ae1ec5e1e97f67d41e641a73380129e5905e41cc (diff) | |
| parent | c87d9732004b3f8fd82d729f12ccfb96c0df279e (diff) | |
Merge branch 'fix/pcm-jiffies-check' into topic/pcm-jiffies-check
Diffstat (limited to 'drivers/input/ff-memless.c')
| -rw-r--r-- | drivers/input/ff-memless.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c index bc4e40f3ede7..2d1415e16834 100644 --- a/drivers/input/ff-memless.c +++ b/drivers/input/ff-memless.c | |||
| @@ -226,7 +226,7 @@ static int get_compatible_type(struct ff_device *ff, int effect_type) | |||
| 226 | */ | 226 | */ |
| 227 | static void ml_combine_effects(struct ff_effect *effect, | 227 | static void ml_combine_effects(struct ff_effect *effect, |
| 228 | struct ml_effect_state *state, | 228 | struct ml_effect_state *state, |
| 229 | int gain) | 229 | unsigned int gain) |
| 230 | { | 230 | { |
| 231 | struct ff_effect *new = state->effect; | 231 | struct ff_effect *new = state->effect; |
| 232 | unsigned int strong, weak, i; | 232 | unsigned int strong, weak, i; |