From: Maxim Levitsky Date: Mon, 6 Sep 2010 21:26:09 +0000 (-0300) Subject: V4L/DVB: IR: fix keys beeing stuck down forever X-Git-Tag: v2.6.35.8~69 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=06deee8ca72d6ebbe1d505f00067c87925e17812;p=karo-tx-linux.git V4L/DVB: IR: fix keys beeing stuck down forever commit e0172fd373ab77a83ea952fd6a75c612e1b0bf9e upstream. The logic in ir_timer_keyup was inverted. In case that values aren't equal, the meaning of the time_is_after_eq_jiffies(ir->keyup_jiffies) is that ir->keyup_jiffies is after the the jiffies or equally that that jiffies are before the the ir->keyup_jiffies which is exactly the situation we want to avoid (that the timeout is in the future) Confusing Eh? Signed-off-by: Maxim Levitsky Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/IR/ir-keytable.c index 94a8577e72eb..78eb8cbc1d53 100644 --- a/drivers/media/IR/ir-keytable.c +++ b/drivers/media/IR/ir-keytable.c @@ -319,7 +319,7 @@ static void ir_timer_keyup(unsigned long cookie) * a keyup event might follow immediately after the keydown. */ spin_lock_irqsave(&ir->keylock, flags); - if (time_is_after_eq_jiffies(ir->keyup_jiffies)) + if (time_is_before_eq_jiffies(ir->keyup_jiffies)) ir_keyup(ir); spin_unlock_irqrestore(&ir->keylock, flags); }