From: Andrew Morton <akpm@osdl.org>
Date: Mon, 9 Jan 2006 17:25:28 +0000 (-0200)
Subject: V4L/DVB (3193): Replace del_timer with del_timer_sync
X-Git-Tag: v2.6.16-rc1~663^2~73
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=bc61b0102a53ee0ced3a8747cd4afe656a453756;p=safe%2Fjmp%2Flinux-2.6

V4L/DVB (3193): Replace del_timer with del_timer_sync


- Replace del_timer with del_timer_sync

Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
---

diff --git a/drivers/media/video/bttv-input.c b/drivers/media/video/bttv-input.c
index fa6ccbc..12197f1 100644
--- a/drivers/media/video/bttv-input.c
+++ b/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);