Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[cascardo/linux.git] / drivers / media / video / bt8xx / bttv-input.c

diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index 97793b9..e8b64bc 100644 (file)
--- 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)
 
 static void bttv_ir_stop(struct bttv *btv)
 {
-       if (btv->remote->polling) {
+       if (btv->remote->polling)
                del_timer_sync(&btv->remote->timer);
-               flush_scheduled_work();
-       }
 
        if (btv->remote->rc5_gpio) {
                u32 gpio;
 
                del_timer_sync(&btv->remote->timer);
-               flush_scheduled_work();
 
                gpio = bttv_gpio_read(&btv->c);
                bttv_gpio_write(&btv->c, gpio & ~(1 << 4));