usb: gadget: uvc: Factor out video USB request queueing

USB requests for video data are queued from two different locations in
the driver, with the same code block occurring twice. Factor it out to a
function.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Tested-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c
index d3567b90343a4ab57cd185360b30761307304e3a..a95c8e2364edcc1dbf6d66fcfc6a75fa25b0ba05 100644 (file)
--- a/drivers/usb/gadget/function/uvc_video.c
+++ b/drivers/usb/gadget/function/uvc_video.c
@@ -125,6 +125,19 @@ uvc_video_encode_isoc(struct usb_request *req, struct uvc_video *video,
  * Request handling
  */
 
+static int uvcg_video_ep_queue(struct uvc_video *video, struct usb_request *req)
+{
+       int ret;
+
+       ret = usb_ep_queue(video->ep, req, GFP_ATOMIC);
+       if (ret < 0) {
+               printk(KERN_INFO "Failed to queue request (%d).\n", ret);
+               usb_ep_set_halt(video->ep);
+       }
+
+       return ret;
+}
+
 /*
  * I somehow feel that synchronisation won't be easy to achieve here. We have
  * three events that control USB requests submission:
@@ -189,14 +202,13 @@ uvc_video_complete(struct usb_ep *ep, struct usb_request *req)
 
        video->encode(req, video, buf);
 
-       if ((ret = usb_ep_queue(ep, req, GFP_ATOMIC)) < 0) {
-               printk(KERN_INFO "Failed to queue request (%d).\n", ret);
-               usb_ep_set_halt(ep);
-               spin_unlock_irqrestore(&video->queue.irqlock, flags);
+       ret = uvcg_video_ep_queue(video, req);
+       spin_unlock_irqrestore(&video->queue.irqlock, flags);
+
+       if (ret < 0) {
                uvcg_queue_cancel(queue, 0);
                goto requeue;
        }
-       spin_unlock_irqrestore(&video->queue.irqlock, flags);
 
        return;
 
@@ -316,15 +328,13 @@ int uvcg_video_pump(struct uvc_video *video)
                video->encode(req, video, buf);
 
                /* Queue the USB request */
-               ret = usb_ep_queue(video->ep, req, GFP_ATOMIC);
+               ret = uvcg_video_ep_queue(video, req);
+               spin_unlock_irqrestore(&queue->irqlock, flags);
+
                if (ret < 0) {
-                       printk(KERN_INFO "Failed to queue request (%d)\n", ret);
-                       usb_ep_set_halt(video->ep);
-                       spin_unlock_irqrestore(&queue->irqlock, flags);
                        uvcg_queue_cancel(queue, 0);
                        break;
                }
-               spin_unlock_irqrestore(&queue->irqlock, flags);
        }
 
        spin_lock_irqsave(&video->req_lock, flags);