From 87e486b292877933567ec8013164e7995c5ec11c Mon Sep 17 00:00:00 2001 From: Jari Vanhala Date: Thu, 24 Dec 2009 21:52:19 -0800 Subject: [PATCH] --- yaml --- r: 178651 b: refs/heads/master c: 25ae08317647c68ed9276f7bdc07d0d5fd042628 h: refs/heads/master i: 178649: e50196bde3e2d14cfe672caee0a215b826eab3a1 178647: 706cbbf1d36a4436025b05516859acb11fc52080 v: v3 --- [refs] | 2 +- trunk/drivers/input/ff-memless.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c7308df47163..293136c8256a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea486e681188d64c6a101d8d06414aef0f9f0cd3 +refs/heads/master: 25ae08317647c68ed9276f7bdc07d0d5fd042628 diff --git a/trunk/drivers/input/ff-memless.c b/trunk/drivers/input/ff-memless.c index b483b2995fa9..decc51f45bfd 100644 --- a/trunk/drivers/input/ff-memless.c +++ b/trunk/drivers/input/ff-memless.c @@ -411,8 +411,6 @@ static int ml_ff_playback(struct input_dev *dev, int effect_id, int value) msecs_to_jiffies(state->effect->replay.length); state->adj_at = state->play_at; - ml_schedule_timer(ml); - } else { debug("initiated stop"); @@ -420,10 +418,10 @@ static int ml_ff_playback(struct input_dev *dev, int effect_id, int value) __set_bit(FF_EFFECT_ABORTING, &state->flags); else __clear_bit(FF_EFFECT_STARTED, &state->flags); - - ml_play_effects(ml); } + ml_play_effects(ml); + return 0; }