Hi Hans, Thank you for the patch.
On Tuesday 03 February 2015 13:47:24 Hans Verkuil wrote: > From: Hans Verkuil <[email protected]> > > Instead of .ioctl use unlocked_ioctl. While all the queue ops > already use a lock, there was no lock to protect uvc_video, so > add that one. There's more. streamon and streamoff need to be protected by a lock for instance. Wouldn't it be easier to just set vdev->lock for this driver instead of adding manual locking ? > Signed-off-by: Hans Verkuil <[email protected]> > --- > drivers/usb/gadget/function/f_uvc.c | 1 + > drivers/usb/gadget/function/uvc.h | 1 + > drivers/usb/gadget/function/uvc_v4l2.c | 6 +++++- > 3 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/gadget/function/f_uvc.c > b/drivers/usb/gadget/function/f_uvc.c index 945b3bd..748a80c 100644 > --- a/drivers/usb/gadget/function/f_uvc.c > +++ b/drivers/usb/gadget/function/f_uvc.c > @@ -817,6 +817,7 @@ static struct usb_function *uvc_alloc(struct > usb_function_instance *fi) if (uvc == NULL) > return ERR_PTR(-ENOMEM); > > + mutex_init(&uvc->video.mutex); We need a corresponding mutex_destroy() somewhere. > uvc->state = UVC_STATE_DISCONNECTED; > opts = to_f_uvc_opts(fi); > > diff --git a/drivers/usb/gadget/function/uvc.h > b/drivers/usb/gadget/function/uvc.h index f67695c..3390ecd 100644 > --- a/drivers/usb/gadget/function/uvc.h > +++ b/drivers/usb/gadget/function/uvc.h > @@ -115,6 +115,7 @@ struct uvc_video > unsigned int width; > unsigned int height; > unsigned int imagesize; > + struct mutex mutex; /* protects frame parameters */ > > /* Requests */ > unsigned int req_size; > diff --git a/drivers/usb/gadget/function/uvc_v4l2.c > b/drivers/usb/gadget/function/uvc_v4l2.c index 5aad7fe..67f084f 100644 > --- a/drivers/usb/gadget/function/uvc_v4l2.c > +++ b/drivers/usb/gadget/function/uvc_v4l2.c > @@ -88,6 +88,7 @@ uvc_v4l2_get_format(struct file *file, void *fh, struct > v4l2_format *fmt) struct uvc_device *uvc = video_get_drvdata(vdev); > struct uvc_video *video = &uvc->video; > > + mutex_lock(&video->mutex); > fmt->fmt.pix.pixelformat = video->fcc; > fmt->fmt.pix.width = video->width; > fmt->fmt.pix.height = video->height; > @@ -96,6 +97,7 @@ uvc_v4l2_get_format(struct file *file, void *fh, struct > v4l2_format *fmt) fmt->fmt.pix.sizeimage = video->imagesize; > fmt->fmt.pix.colorspace = V4L2_COLORSPACE_SRGB; > fmt->fmt.pix.priv = 0; > + mutex_unlock(&video->mutex); > > return 0; > } > @@ -126,11 +128,13 @@ uvc_v4l2_set_format(struct file *file, void *fh, > struct v4l2_format *fmt) bpl = format->bpp * fmt->fmt.pix.width / 8; > imagesize = bpl ? bpl * fmt->fmt.pix.height : fmt->fmt.pix.sizeimage; > > + mutex_lock(&video->mutex); > video->fcc = format->fcc; > video->bpp = format->bpp; > video->width = fmt->fmt.pix.width; > video->height = fmt->fmt.pix.height; > video->imagesize = imagesize; > + mutex_unlock(&video->mutex); > > fmt->fmt.pix.field = V4L2_FIELD_NONE; > fmt->fmt.pix.bytesperline = bpl; > @@ -356,7 +360,7 @@ struct v4l2_file_operations uvc_v4l2_fops = { > .owner = THIS_MODULE, > .open = uvc_v4l2_open, > .release = uvc_v4l2_release, > - .ioctl = video_ioctl2, > + .unlocked_ioctl = video_ioctl2, > .mmap = uvc_v4l2_mmap, > .poll = uvc_v4l2_poll, > #ifndef CONFIG_MMU -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
