From e6211667211465b872dab3a778337f9b58bc53e6 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Mon, 30 May 2011 15:02:00 -0300 Subject: [PATCH] --- yaml --- r: 254637 b: refs/heads/master c: aa122d424b14b4a4c5ba302e668366717e9cac7b h: refs/heads/master i: 254635: 2492f9ac0201d08f87ea1ea44d5b239ab256c2af v: v3 --- [refs] | 2 +- trunk/drivers/media/video/uvc/uvc_video.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 042a12c1e2d6..41beec1193de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ca2c80b170c47eeb55f0c2a0f2b8edf85f35d49 +refs/heads/master: aa122d424b14b4a4c5ba302e668366717e9cac7b diff --git a/trunk/drivers/media/video/uvc/uvc_video.c b/trunk/drivers/media/video/uvc/uvc_video.c index fc766b9f24c5..49994793cc77 100644 --- a/trunk/drivers/media/video/uvc/uvc_video.c +++ b/trunk/drivers/media/video/uvc/uvc_video.c @@ -1255,8 +1255,10 @@ int uvc_video_enable(struct uvc_streaming *stream, int enable) /* Commit the streaming parameters. */ ret = uvc_commit_video(stream, &stream->ctrl); - if (ret < 0) + if (ret < 0) { + uvc_queue_enable(&stream->queue, 0); return ret; + } return uvc_init_video(stream, GFP_KERNEL); }