aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/bttv-input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/bttv-input.c b/drivers/media/video/bttv-input.c
index fa6ccbc6f26..12197f1b275 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);