summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/stk1160/stk1160-v4l.c
diff options
context:
space:
mode:
authorEzequiel Garcia <ezequiel.garcia@free-electrons.com>2013-07-17 09:43:22 +0200
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-07-26 18:30:52 +0200
commit9928ac7cddd5db4cdf3121f1992192adb41df9c3 (patch)
treeb97f2875d1294e3762d9011ce3e0137270899af7 /drivers/media/usb/stk1160/stk1160-v4l.c
parent[media] usbtv: remove unused including <linux/version.h> (diff)
downloadlinux-9928ac7cddd5db4cdf3121f1992192adb41df9c3.tar.xz
linux-9928ac7cddd5db4cdf3121f1992192adb41df9c3.zip
[media] stk1160: Allow to change input while streaming
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>
Diffstat (limited to 'drivers/media/usb/stk1160/stk1160-v4l.c')
-rw-r--r--drivers/media/usb/stk1160/stk1160-v4l.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c b/drivers/media/usb/stk1160/stk1160-v4l.c
index 876fc26565e3..ee46d82bed5d 100644
--- a/drivers/media/usb/stk1160/stk1160-v4l.c
+++ b/drivers/media/usb/stk1160/stk1160-v4l.c
@@ -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;