Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebe864a6 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Felipe Balbi
Browse files

usb: gadget: uvc: Fix error handling in uvc_queue_buffer() 



The conversion to videobuf2 failed to check the return value of
vb2_qbuf(). Fix it.

Cc: stable@vger.kernel.org
Reported-by: default avatarMichael Grzeschik <mgr@pengutronix.de>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-By: default avatarMichael Grzeschik <mgr@pengutronix.de>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 9b3452d1

drivers/usb/gadget/uvc_queue.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -193,12 +193,16 @@ static int uvc_queue_buffer(struct uvc_video_queue *queue, 




	mutex_lock(&queue->mutex);

	mutex_lock(&queue->mutex);

	ret = vb2_qbuf(&queue->queue, buf);

	ret = vb2_qbuf(&queue->queue, buf);

	if (ret < 0)

		goto done;



	spin_lock_irqsave(&queue->irqlock, flags);

	spin_lock_irqsave(&queue->irqlock, flags);

	ret = (queue->flags & UVC_QUEUE_PAUSED) != 0;

	ret = (queue->flags & UVC_QUEUE_PAUSED) != 0;

	queue->flags &= ~UVC_QUEUE_PAUSED;

	queue->flags &= ~UVC_QUEUE_PAUSED;

	spin_unlock_irqrestore(&queue->irqlock, flags);

	spin_unlock_irqrestore(&queue->irqlock, flags);

	mutex_unlock(&queue->mutex);





done:

	mutex_unlock(&queue->mutex);

	return ret;

	return ret;

}

}