diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
| commit | ebc01f593b58e1896150fc2e3cbdd0116323c52c (patch) | |
| tree | 23e905a3fdbee3fc8a66ef760b9ed5ef5455e9dd /drivers/usb/gadget/function/uvc_video.c | |
| parent | 3f7256fe5fc64132a2dd19695255c990aa2188cf (diff) | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
Merge tag 'v3.18-rc3' into asoc-sgtl5000
Linux 3.18-rc3
Diffstat (limited to 'drivers/usb/gadget/function/uvc_video.c')
| -rw-r--r-- | drivers/usb/gadget/function/uvc_video.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c index c3e1f27dbbef..9cb86bc1a9a5 100644 --- a/drivers/usb/gadget/function/uvc_video.c +++ b/drivers/usb/gadget/function/uvc_video.c | |||
| @@ -352,7 +352,8 @@ int uvcg_video_enable(struct uvc_video *video, int enable) | |||
| 352 | 352 | ||
| 353 | if (!enable) { | 353 | if (!enable) { |
| 354 | for (i = 0; i < UVC_NUM_REQUESTS; ++i) | 354 | for (i = 0; i < UVC_NUM_REQUESTS; ++i) |
| 355 | usb_ep_dequeue(video->ep, video->req[i]); | 355 | if (video->req[i]) |
| 356 | usb_ep_dequeue(video->ep, video->req[i]); | ||
| 356 | 357 | ||
| 357 | uvc_video_free_requests(video); | 358 | uvc_video_free_requests(video); |
| 358 | uvcg_queue_enable(&video->queue, 0); | 359 | uvcg_queue_enable(&video->queue, 0); |