aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/uvc/uvc_driver.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2014-10-21 16:19:04 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-25 08:42:01 -0200
commit0da4ab984b1753b160b5fa840ae98b87228ac3dc (patch)
tree0e729c8d972d1e6ce63f32e903b2425ff382645f /drivers/media/usb/uvc/uvc_driver.c
parent1b7f9c989ee7684dc70f0a75a037ecb1d437d3c2 (diff)
[media] uvcvideo: Rename and split uvc_queue_enable to uvc_queue_stream(on|off)
This brings the function name in line with the V4L2 API terminology and allows removing the duplicate queue type check. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/uvc/uvc_driver.c')
-rw-r--r--drivers/media/usb/uvc/uvc_driver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index ab1e2fd0a599..6a4b0b8cd270 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -2038,7 +2038,8 @@ static int __uvc_resume(struct usb_interface *intf, int reset)
if (stream->intf == intf) {
ret = uvc_video_resume(stream, reset);
if (ret < 0)
- uvc_queue_enable(&stream->queue, 0);
+ uvc_queue_streamoff(&stream->queue,
+ stream->queue.queue.type);
return ret;
}
}

Privacy Policy