aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/uvc/uvc_v4l2.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2015-03-09 12:34:11 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-04-08 05:47:13 -0400
commitd8da7513bcf9834abbb1963f909f96a9f513dd65 (patch)
tree3352de1b0032666b831c0ad44615378b6559e879 /drivers/media/usb/uvc/uvc_v4l2.c
parentd4352f3639d780f1727c26708cb511a3e3702226 (diff)
[media] uvc: embed video_device
Embed the video_device struct to simplify the error handling and in order to (eventually) get rid of video_device_alloc/release. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/uvc/uvc_v4l2.c')
-rw-r--r--drivers/media/usb/uvc/uvc_v4l2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index 8d967fe2ef7d..b6a09835e7aa 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -511,7 +511,7 @@ static int uvc_v4l2_open(struct file *file)
511 stream->dev->users++; 511 stream->dev->users++;
512 mutex_unlock(&stream->dev->lock); 512 mutex_unlock(&stream->dev->lock);
513 513
514 v4l2_fh_init(&handle->vfh, stream->vdev); 514 v4l2_fh_init(&handle->vfh, &stream->vdev);
515 v4l2_fh_add(&handle->vfh); 515 v4l2_fh_add(&handle->vfh);
516 handle->chain = stream->chain; 516 handle->chain = stream->chain;
517 handle->stream = stream; 517 handle->stream = stream;