aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bt8xx/bttv-input.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-input.c')
-rw-r--r--drivers/media/video/bt8xx/bttv-input.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index 97793b960600..e8b64bca9db2 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -319,16 +319,13 @@ static void bttv_ir_start(struct bttv *btv, struct bttv_ir *ir)
319 319
320static void bttv_ir_stop(struct bttv *btv) 320static void bttv_ir_stop(struct bttv *btv)
321{ 321{
322 if (btv->remote->polling) { 322 if (btv->remote->polling)
323 del_timer_sync(&btv->remote->timer); 323 del_timer_sync(&btv->remote->timer);
324 flush_scheduled_work();
325 }
326 324
327 if (btv->remote->rc5_gpio) { 325 if (btv->remote->rc5_gpio) {
328 u32 gpio; 326 u32 gpio;
329 327
330 del_timer_sync(&btv->remote->timer); 328 del_timer_sync(&btv->remote->timer);
331 flush_scheduled_work();
332 329
333 gpio = bttv_gpio_read(&btv->c); 330 gpio = bttv_gpio_read(&btv->c);
334 bttv_gpio_write(&btv->c, gpio & ~(1 << 4)); 331 bttv_gpio_write(&btv->c, gpio & ~(1 << 4));