From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Sun, 10 Feb 2013 17:36:41 +0000 (-0300)
Subject: [media] stk-webcam: s_fmt shouldn't grab ownership
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f81e372a5d11694b86fc35ded379a441c209b920;p=linux-beck.git

[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>
---

diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c
index a8fdbaf34720..45d73e2f3e57 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);