]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
usb: gadget: uvc: Fix error handling in uvc_queue_buffer()
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Mon, 29 Apr 2013 20:18:01 +0000 (22:18 +0200)
committerFelipe Balbi <balbi@ti.com>
Fri, 9 Aug 2013 14:40:54 +0000 (17:40 +0300)
The conversion to videobuf2 failed to check the return value of
vb2_qbuf(). Fix it.

Cc: stable@vger.kernel.org
Reported-by: Michael Grzeschik <mgr@pengutronix.de>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-By: Michael Grzeschik <mgr@pengutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/gadget/uvc_queue.c

index e6170478ea9f737b0a6eeec9a1a9524a5307db62..0bb5d50075de108ea3636d7973d9eda10984856b 100644 (file)
@@ -193,12 +193,16 @@ static int uvc_queue_buffer(struct uvc_video_queue *queue,
 
        mutex_lock(&queue->mutex);
        ret = vb2_qbuf(&queue->queue, buf);
+       if (ret < 0)
+               goto done;
+
        spin_lock_irqsave(&queue->irqlock, flags);
        ret = (queue->flags & UVC_QUEUE_PAUSED) != 0;
        queue->flags &= ~UVC_QUEUE_PAUSED;
        spin_unlock_irqrestore(&queue->irqlock, flags);
-       mutex_unlock(&queue->mutex);
 
+done:
+       mutex_unlock(&queue->mutex);
        return ret;
 }