From c07ead7ad8827fa026b6b6aef4587f629397c485 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:43:17 -0300
Subject: [PATCH] --- yaml --- r: 226284 b: refs/heads/master c:
 3938e0cfeb812e7b66f4e1cb6e34eb2e6864c6a2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 570ee8816020..aedbe7033ae6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edb4c25ca3a7997660500692eca3510eac9726e5
+refs/heads/master: 3938e0cfeb812e7b66f4e1cb6e34eb2e6864c6a2
diff --git a/trunk/drivers/media/video/bt8xx/bttv-input.c b/trunk/drivers/media/video/bt8xx/bttv-input.c
index c344b626e113..989c0481e3b1 100644
--- a/trunk/drivers/media/video/bt8xx/bttv-input.c
+++ b/trunk/drivers/media/video/bt8xx/bttv-input.c
@@ -283,8 +283,7 @@ static int bttv_rc5_irq(struct bttv *btv)
 		ir->base_time = tv;
 		ir->last_bit = 0;
 
-		mod_timer(&ir->timer_end,
-			  current_jiffies + msecs_to_jiffies(30));
+		mod_timer(&ir->timer, current_jiffies + msecs_to_jiffies(30));
 	}
 
 	/* toggle GPIO pin 4 to reset the irq */
@@ -303,8 +302,7 @@ static void bttv_ir_start(struct bttv *btv, struct bttv_ir *ir)
 		add_timer(&ir->timer);
 	} else if (ir->rc5_gpio) {
 		/* set timer_end for code completion */
-		setup_timer(&ir->timer_end, bttv_rc5_timer_end,
-			    (unsigned long)ir);
+		setup_timer(&ir->timer, bttv_rc5_timer_end, (unsigned long)ir);
 		ir->shift_by = 1;
 		ir->start = 3;
 		ir->addr = 0x0;
@@ -322,7 +320,7 @@ static void bttv_ir_stop(struct bttv *btv)
 	if (btv->remote->rc5_gpio) {
 		u32 gpio;
 
-		del_timer_sync(&btv->remote->timer_end);
+		del_timer_sync(&btv->remote->timer);
 		flush_scheduled_work();
 
 		gpio = bttv_gpio_read(&btv->c);
diff --git a/trunk/drivers/media/video/bt8xx/bttvp.h b/trunk/drivers/media/video/bt8xx/bttvp.h
index 3d5b2bc1d376..071232045605 100644
--- a/trunk/drivers/media/video/bt8xx/bttvp.h
+++ b/trunk/drivers/media/video/bt8xx/bttvp.h
@@ -122,6 +122,7 @@ struct bttv_format {
 
 struct bttv_ir {
 	struct rc_dev           *dev;
+	struct timer_list       timer;
 
 	char                    name[32];
 	char                    phys[32];
@@ -136,11 +137,9 @@ struct bttv_ir {
 	int                     start; // What should RC5_START() be
 	int                     addr; // What RC5_ADDR() should be.
 	int                     rc5_remote_gap;
-	struct timer_list       timer;
 
 	/* RC5 gpio */
 	u32                     rc5_gpio;
-	struct timer_list       timer_end;  /* timer_end for code completion */
 	u32                     last_bit;   /* last raw bit seen */
 	u32                     code;       /* raw code under construction */
 	struct timeval          base_time;  /* time of last seen code */