asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] saa7134: simplify timer activation

Browse source 
This simplies the code and resolves a possible race condition between
ir_raw_decode_timer_end() and saa7134_raw_decode_irq().

If the interrupt handler is called after ir_raw_decode_timer_end()
calls ir_raw_event_handle() but before clearing ir->active, then the
timer won't be rearmed.

Compile tested only.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sean Young 2012-08-13 08:59:48 -03:00 committed by Mauro Carvalho Chehab
parent b83bfd1b01
commit 4da212e2ff
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/media/video/saa7134/saa7134-input.c
View file

@ -446,11 +446,8 @@ static void saa7134_input_timer(unsigned long data)
static void ir_raw_decode_timer_end(unsigned long data)
{
struct saa7134_dev *dev = (struct saa7134_dev *)data;
struct saa7134_card_ir *ir = dev->remote;
ir_raw_event_handle(dev->remote->dev);
ir->active = false;
}
static int __saa7134_ir_start(void *priv)
@ -501,7 +498,6 @@ static int __saa7134_ir_start(void *priv)
}
ir->running = true;
ir->active = false;
if (ir->polling) {
setup_timer(&ir->timer, saa7134_input_timer,
@ -532,7 +528,6 @@ static void __saa7134_ir_stop(void *priv)
if (ir->polling || ir->raw_decode)
del_timer_sync(&ir->timer);
ir->active = false;
ir->running = false;
return;
@ -1035,10 +1030,11 @@ static int saa7134_raw_decode_irq(struct saa7134_dev *dev)
* the event. This time is enough for NEC protocol. May need adjustments
* to work with other protocols.
*/
if (!ir->active) {
smp_mb();
if (!timer_pending(&ir->timer)) {
timeout = jiffies + msecs_to_jiffies(15);
mod_timer(&ir->timer, timeout);
ir->active = true;
}
return 1;

1
drivers/media/video/saa7134/saa7134.h
View file

@ -130,7 +130,6 @@ struct saa7134_card_ir {
u32 mask_keycode, mask_keydown, mask_keyup;
bool running;
bool active;
struct timer_list timer;