]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] stk1160: Allow to change input while streaming
authorEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Wed, 17 Jul 2013 07:43:22 +0000 (04:43 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Fri, 26 Jul 2013 16:30:52 +0000 (13:30 -0300)
Remove the check as there's no reason to prevent the input from
being set when the device is streaming. This allows surveillance
applications (such as motion, zoneminder, etc.) to configure the
input while streaming.

Reported-by: Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/usb/stk1160/stk1160-v4l.c

index 876fc26565e3bc05dbfe4a192ffe916080495fb2..ee46d82bed5dfa23a7c0b16270b08256af1fb517 100644 (file)
@@ -440,9 +440,6 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
 {
        struct stk1160 *dev = video_drvdata(file);
 
-       if (vb2_is_busy(&dev->vb_vidq))
-               return -EBUSY;
-
        if (i > STK1160_MAX_INPUT)
                return -EINVAL;