From bc61b0102a53ee0ced3a8747cd4afe656a453756 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 9 Jan 2006 15:25:28 -0200 Subject: V4L/DVB (3193): Replace del_timer with del_timer_sync - Replace del_timer with del_timer_sync Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/bttv-input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/media/video/bttv-input.c b/drivers/media/video/bttv-input.c index fa6ccbc6f26df9..12197f1b27578a 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); -- cgit 1.2.3-korg