UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Hans Verkuil 2013-02-10 14:36:41 -03:00 committed by Mauro Carvalho Chehab
parent 1b499fe506
commit f81e372a5d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/usb/stkwebcam/stk-webcam.c
View File

@ -1019,12 +1019,11 @@ static int stk_vidioc_s_fmt_vid_cap(struct file *filp,
return -ENODEV; return -ENODEV;
if (is_streaming(dev)) if (is_streaming(dev))
return -EBUSY; return -EBUSY;
if (dev->owner && dev->owner != filp) if (dev->owner)
return -EBUSY; return -EBUSY;
ret = stk_try_fmt_vid_cap(filp, fmtd, &idx); ret = stk_try_fmt_vid_cap(filp, fmtd, &idx);
if (ret) if (ret)
return ret; return ret;
dev->owner = filp;
dev->vsettings.palette = fmtd->fmt.pix.pixelformat; dev->vsettings.palette = fmtd->fmt.pix.pixelformat;
stk_free_buffers(dev); stk_free_buffers(dev);