summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/stkwebcam
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-02-10 14:36:41 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-05 14:44:04 -0300
commitf81e372a5d11694b86fc35ded379a441c209b920 (patch)
treefc8ec3368286d270a1703081041c4f1188cf91f6 /drivers/media/usb/stkwebcam
parent1b499fe506257369fd6059422989e36c71b99897 (diff)
downloadop-kernel-dev-f81e372a5d11694b86fc35ded379a441c209b920.zip
op-kernel-dev-f81e372a5d11694b86fc35ded379a441c209b920.tar.gz
[media] stk-webcam: s_fmt shouldn't grab ownership
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Tested-by: Arvydas Sidorenko <asido4@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/stkwebcam')
-rw-r--r--drivers/media/usb/stkwebcam/stk-webcam.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c
index a8fdbaf..45d73e2 100644
--- a/drivers/media/usb/stkwebcam/stk-webcam.c
+++ b/drivers/media/usb/stkwebcam/stk-webcam.c
@@ -1019,12 +1019,11 @@ static int stk_vidioc_s_fmt_vid_cap(struct file *filp,
return -ENODEV;
if (is_streaming(dev))
return -EBUSY;
- if (dev->owner && dev->owner != filp)
+ if (dev->owner)
return -EBUSY;
ret = stk_try_fmt_vid_cap(filp, fmtd, &idx);
if (ret)
return ret;
- dev->owner = filp;
dev->vsettings.palette = fmtd->fmt.pix.pixelformat;
stk_free_buffers(dev);
OpenPOWER on IntegriCloud