From 45af08fa4d06ba60633093b6950d3f6c82ccf6fa Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Mon, 9 Jan 2006 15:25:28 -0200
Subject: [PATCH] --- yaml --- r: 17320 b: refs/heads/master c:
 bc61b0102a53ee0ced3a8747cd4afe656a453756 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/bttv-input.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4f02ef7d38e0..5f03d4e35998 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 889aee805a0c286e33965cc678ea16672d6c5666
+refs/heads/master: bc61b0102a53ee0ced3a8747cd4afe656a453756
diff --git a/trunk/drivers/media/video/bttv-input.c b/trunk/drivers/media/video/bttv-input.c
index fa6ccbc6f26d..12197f1b2757 100644
--- a/trunk/drivers/media/video/bttv-input.c
+++ b/trunk/drivers/media/video/bttv-input.c
@@ -668,7 +668,7 @@ void bttv_input_fini(struct bttv *btv)
 	if (btv->remote->rc5_gpio) {
 		u32 gpio;
 
-		del_timer(&btv->remote->timer_end);
+		del_timer_sync(&btv->remote->timer_end);
 		flush_scheduled_work();
 
 		gpio = bttv_gpio_read(&btv->c);