From: Felipe Balbi Date: Mon, 29 Sep 2014 14:19:59 +0000 (-0500) Subject: usb: gadget: function: uvc: conditionally dequeue X-Git-Tag: v3.18-rc3~9^2~2^2~29 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d7577b389233a74609841492feaf6a55967aa5c8;p=karo-tx-linux.git usb: gadget: function: uvc: conditionally dequeue We shouldn't try to dequeue a NULL pointer. Signed-off-by: Felipe Balbi --- 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) if (!enable) { for (i = 0; i < UVC_NUM_REQUESTS; ++i) - usb_ep_dequeue(video->ep, video->req[i]); + if (video->req[i]) + usb_ep_dequeue(video->ep, video->req[i]); uvc_video_free_requests(video); uvcg_queue_enable(&video->queue, 0);