diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-10-25 09:03:42 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-11 11:13:29 -0200 |
| commit | 24c3aae0c740ae9837284266ea82234415721dc1 (patch) | |
| tree | a6ba9f1ff29057195ef6ea9bb2ae7ea6eb99e524 /drivers/media/video/uvc | |
| parent | 6998b6fb4b1c8f320adeee938d399c4d8dcc90e2 (diff) | |
| download | op-kernel-dev-24c3aae0c740ae9837284266ea82234415721dc1.zip op-kernel-dev-24c3aae0c740ae9837284266ea82234415721dc1.tar.gz | |
[media] uvcvideo: Handle uvc_init_video() failure in uvc_video_enable()
Turn streaming off (by selecting alternate setting 0) and disable the
video buffers queue in the uvc_video_enable() error path.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc')
| -rw-r--r-- | drivers/media/video/uvc/uvc_video.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c index 2995f26..2e5e728 100644 --- a/drivers/media/video/uvc/uvc_video.c +++ b/drivers/media/video/uvc/uvc_video.c @@ -1283,6 +1283,11 @@ int uvc_video_enable(struct uvc_streaming *stream, int enable) return ret; } - return uvc_init_video(stream, GFP_KERNEL); -} + ret = uvc_init_video(stream, GFP_KERNEL); + if (ret < 0) { + usb_set_interface(stream->dev->udev, stream->intfnum, 0); + uvc_queue_enable(&stream->queue, 0); + } + return ret; +} |
