---

yaml
---
r: 299423
b: refs/heads/master
c: 6190c79
h: refs/heads/master
i:
  299421: 0f00e62
  299419: 4ae7e5a
  299415: 46c2be9
  299407: 976f21e
  299391: 9b26732
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f135617224b4a1113b26b8ee5877e94f38e40d1e
+refs/heads/master: 6190c79df861d2c78a7448fe6d4260e5fa53b9b9

trunk/drivers/usb/gadget/uvc_queue.c

@@ -543,11 +543,11 @@ static int uvc_queue_enable(struct uvc_video_queue *queue, int enable)
 	return ret;
 }
 
+/* called with queue->irqlock held.. */
 static struct uvc_buffer *
 uvc_queue_next_buffer(struct uvc_video_queue *queue, struct uvc_buffer *buf)
 {
 	struct uvc_buffer *nextbuf;
-	unsigned long flags;
 
 	if ((queue->flags & UVC_QUEUE_DROP_INCOMPLETE) &&
 	    buf->buf.length != buf->buf.bytesused) {
@@ -556,14 +556,12 @@ uvc_queue_next_buffer(struct uvc_video_queue *queue, struct uvc_buffer *buf)
 		return buf;
 	}
 
-	spin_lock_irqsave(&queue->irqlock, flags);
 	list_del(&buf->queue);
 	if (!list_empty(&queue->irqqueue))
 		nextbuf = list_first_entry(&queue->irqqueue, struct uvc_buffer,
 					   queue);
 	else
 		nextbuf = NULL;
-	spin_unlock_irqrestore(&queue->irqlock, flags);
 
 	buf->buf.sequence = queue->sequence++;
 	do_gettimeofday(&buf->buf.timestamp);