Merge git://www.linux-watchdog.org/linux-watchdog

[linux-2.6-block.git] / drivers / media / usb / s2255 / s2255drv.c

diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index a44466bc7b86f4aae5d79510757e7a45abb91c28..2c901861034afd746a6fec9540e1ebf47f2c0156 100644 (file)
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
@@ -1676,7 +1676,6 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
                vc->vdev.ctrl_handler = &vc->hdl;
                vc->vdev.lock = &dev->lock;
                vc->vdev.v4l2_dev = &dev->v4l2_dev;
-               set_bit(V4L2_FL_USE_FH_PRIO, &vc->vdev.flags);
                video_set_drvdata(&vc->vdev, vc);
                if (video_nr == -1)
                        ret = video_register_device(&vc->vdev,