From c7d2857d16be5edb8e5e2e718012cd350b9a7d7b Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Sun, 18 Dec 2005 18:52:14 +0000 Subject: Replace del_timer with del_timer_sync From: Andrew Morton Signed-off-by: Ricardo Cerqueira --- linux/drivers/media/video/bttv-input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux/drivers/media/video/bttv-input.c') diff --git a/linux/drivers/media/video/bttv-input.c b/linux/drivers/media/video/bttv-input.c index 71d5b0cd1..21f8ebc44 100644 --- a/linux/drivers/media/video/bttv-input.c +++ b/linux/drivers/media/video/bttv-input.c @@ -1,5 +1,5 @@ /* - * $Id: bttv-input.c,v 1.2 2005/12/11 17:55:45 mchehab Exp $ + * $Id: bttv-input.c,v 1.3 2005/12/18 18:52:14 rmcc Exp $ * * Copyright (c) 2003 Gerd Knorr * Copyright (c) 2003 Pavel Machek @@ -676,7 +676,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 v1.2.3