From e96ca99e3ac9d3144abbc530d7b699f7429d464c Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.org>
Date: Wed, 2 Apr 2008 18:10:57 -0300
Subject: [PATCH] --- yaml --- r: 92585 b: refs/heads/master c:
 b608f4323a0e0440d18fa13aea3db98351137487 h: refs/heads/master i:   92583:
 1b4cd23d5807e3295e7c60bf2ccf1334cb42e6dc v: v3

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

diff --git a/[refs] b/[refs]
index 102d51b43463..a9519529c2ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8eb8ff3870ede23b2328ef376023a3542efcb9a5
+refs/heads/master: b608f4323a0e0440d18fa13aea3db98351137487
diff --git a/trunk/drivers/media/video/videobuf-core.c b/trunk/drivers/media/video/videobuf-core.c
index fe742fdfae07..e4a864e0d96b 100644
--- a/trunk/drivers/media/video/videobuf-core.c
+++ b/trunk/drivers/media/video/videobuf-core.c
@@ -204,6 +204,7 @@ void videobuf_queue_cancel(struct videobuf_queue *q)
 		if (q->bufs[i]->state == VIDEOBUF_QUEUED) {
 			list_del(&q->bufs[i]->queue);
 			q->bufs[i]->state = VIDEOBUF_ERROR;
+			wake_up_all(&q->bufs[i]->done);
 		}
 	}
 	if (q->irqlock)