From c18a0543ed7e425646a8b471c7371cee29117ff1 Mon Sep 17 00:00:00 2001
From: Bhupesh Sharma <bhupesh.sharma@st.com>
Date: Fri, 23 Mar 2012 22:23:13 +0530
Subject: [PATCH] --- yaml --- r: 299423 b: refs/heads/master c:
 6190c79df861d2c78a7448fe6d4260e5fa53b9b9 h: refs/heads/master i:   299421:
 0f00e62bb43ea6218a296fce8f0514fdc4f4774e   299419:
 4ae7e5a2de5c29e1cec6b2d6ff7654bbfe0f2aeb   299415:
 46c2be906a72f48457dd824d5e579ad9c6d8cf2d   299407:
 976f21e1ef42b15955ac04f2add31a630f5903bc   299391:
 9b267327c05c39ba24abee70679017246429370e v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/usb/gadget/uvc_queue.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b7423c1bc4c1..c204deea0d46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f135617224b4a1113b26b8ee5877e94f38e40d1e
+refs/heads/master: 6190c79df861d2c78a7448fe6d4260e5fa53b9b9
diff --git a/trunk/drivers/usb/gadget/uvc_queue.c b/trunk/drivers/usb/gadget/uvc_queue.c
index d776adb2da67..0cdf89d32a15 100644
--- a/trunk/drivers/usb/gadget/uvc_queue.c
+++ b/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);