From aa98d0251afd77a3e2bf946cc4a61ede7508f821 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Tue, 24 May 2011 12:22:03 -0300
Subject: [PATCH] --- yaml --- r: 254636 b: refs/heads/master c:
 8ca2c80b170c47eeb55f0c2a0f2b8edf85f35d49 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/video/uvc/uvc_queue.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 901ae8e4201a..042a12c1e2d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a96aa5342d575980e5b572cde88036f3a878ebee
+refs/heads/master: 8ca2c80b170c47eeb55f0c2a0f2b8edf85f35d49
diff --git a/trunk/drivers/media/video/uvc/uvc_queue.c b/trunk/drivers/media/video/uvc/uvc_queue.c
index 109a06384a8f..f90ce9fce539 100644
--- a/trunk/drivers/media/video/uvc/uvc_queue.c
+++ b/trunk/drivers/media/video/uvc/uvc_queue.c
@@ -104,6 +104,8 @@ static int __uvc_free_buffers(struct uvc_video_queue *queue)
 	}
 
 	if (queue->count) {
+		uvc_queue_cancel(queue, 0);
+		INIT_LIST_HEAD(&queue->mainqueue);
 		vfree(queue->mem);
 		queue->count = 0;
 	}