From dfc8015dc5aca7b26067f6ab63bdb0894528245f Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Sun, 23 Nov 2008 16:57:36 -0800 Subject: [PATCH] --- yaml --- r: 119329 b: refs/heads/master c: 211f05a034f49586fdd071abd174853217ec29ee h: refs/heads/master i: 119327: 4e77d53e17bd023901027ff92366a7c5dc19307a v: v3 --- [refs] | 2 +- trunk/drivers/input/ff-memless.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0d0f981de1be..ef3df367a7d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02d0e6753d8ab0173b63338157929e52eac86d12 +refs/heads/master: 211f05a034f49586fdd071abd174853217ec29ee diff --git a/trunk/drivers/input/ff-memless.c b/trunk/drivers/input/ff-memless.c index 6790e975a98c..bc4e40f3ede7 100644 --- a/trunk/drivers/input/ff-memless.c +++ b/trunk/drivers/input/ff-memless.c @@ -397,8 +397,9 @@ static int ml_ff_playback(struct input_dev *dev, int effect_id, int value) { struct ml_device *ml = dev->ff->private; struct ml_effect_state *state = &ml->states[effect_id]; + unsigned long flags; - spin_lock_bh(&ml->timer_lock); + spin_lock_irqsave(&ml->timer_lock, flags); if (value > 0) { debug("initiated play"); @@ -424,7 +425,7 @@ static int ml_ff_playback(struct input_dev *dev, int effect_id, int value) ml_play_effects(ml); } - spin_unlock_bh(&ml->timer_lock); + spin_unlock_irqrestore(&ml->timer_lock, flags); return 0; }