Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4da212e2 authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab
Browse files

[media] saa7134: simplify timer activation 



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: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b83bfd1b

drivers/media/video/saa7134/saa7134-input.c

+3 −7
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/saa7134/saa7134.h

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ struct saa7134_card_ir { 
	u32			mask_keycode, mask_keydown, mask_keyup;



	bool                    running;

	bool			active;



	struct timer_list       timer;