diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/bttv-input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/bttv-input.c b/drivers/media/video/bttv-input.c index fa6ccbc6f26d..12197f1b2757 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) | |||
668 | if (btv->remote->rc5_gpio) { | 668 | if (btv->remote->rc5_gpio) { |
669 | u32 gpio; | 669 | u32 gpio; |
670 | 670 | ||
671 | del_timer(&btv->remote->timer_end); | 671 | del_timer_sync(&btv->remote->timer_end); |
672 | flush_scheduled_work(); | 672 | flush_scheduled_work(); |
673 | 673 | ||
674 | gpio = bttv_gpio_read(&btv->c); | 674 | gpio = bttv_gpio_read(&btv->c); |