From 0907e45893b7896f1121fe892b2c88dcc418fc01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20H=C3=83=C2=A4rdeman?= <david@hardeman.nu>
Date: Fri, 19 Nov 2010 20:42:57 -0300
Subject: [PATCH] --- yaml --- r: 226282 b: refs/heads/master c:
 7c8352d18ddbe37cff8ad71175a11739662ef899 h: refs/heads/master v: v3

---
 [refs]                                            |  2 +-
 trunk/drivers/media/video/saa7134/saa7134-input.c | 10 ++++------
 trunk/drivers/media/video/saa7134/saa7134.h       |  1 -
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c9a159c44dd6..e33374946607 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 651c7a5f7f2f7277f8fc4fb38e89c79845ec9bf9
+refs/heads/master: 7c8352d18ddbe37cff8ad71175a11739662ef899
diff --git a/trunk/drivers/media/video/saa7134/saa7134-input.c b/trunk/drivers/media/video/saa7134/saa7134-input.c
index d75c307981bc..98678d941847 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-input.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-input.c
@@ -420,11 +420,11 @@ static int __saa7134_ir_start(void *priv)
 	if (ir->polling) {
 		setup_timer(&ir->timer, saa7134_input_timer,
 			    (unsigned long)dev);
-		ir->timer.expires  = jiffies + HZ;
+		ir->timer.expires = jiffies + HZ;
 		add_timer(&ir->timer);
 	} else if (ir->raw_decode) {
 		/* set timer_end for code completion */
-		setup_timer(&ir->timer_end, ir_raw_decode_timer_end,
+		setup_timer(&ir->timer, ir_raw_decode_timer_end,
 			    (unsigned long)dev);
 	}
 
@@ -443,10 +443,8 @@ static void __saa7134_ir_stop(void *priv)
 	if (!ir->running)
 		return;
 
-	if (ir->polling)
+	if (ir->polling || ir->raw_decode)
 		del_timer_sync(&ir->timer);
-	else if (ir->raw_decode)
-		del_timer_sync(&ir->timer_end);
 
 	ir->active = false;
 	ir->running = false;
@@ -923,7 +921,7 @@ static int saa7134_raw_decode_irq(struct saa7134_dev *dev)
 	 */
 	if (!ir->active) {
 		timeout = jiffies + jiffies_to_msecs(15);
-		mod_timer(&ir->timer_end, timeout);
+		mod_timer(&ir->timer, timeout);
 		ir->active = true;
 	}
 
diff --git a/trunk/drivers/media/video/saa7134/saa7134.h b/trunk/drivers/media/video/saa7134/saa7134.h
index f93951acec41..babfbe7543eb 100644
--- a/trunk/drivers/media/video/saa7134/saa7134.h
+++ b/trunk/drivers/media/video/saa7134/saa7134.h
@@ -134,7 +134,6 @@ struct saa7134_card_ir {
 	bool			active;
 
 	struct timer_list       timer;
-	struct timer_list	timer_end;    /* timer_end for code completion */
 
 	/* IR core raw decoding */
 	u32                     raw_decode;