From 844a75393460306456c01f813d6fd13de3980179 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Wed, 23 Sep 2009 18:06:57 -0300
Subject: [PATCH] --- yaml --- r: 168392 b: refs/heads/master c:
 1f95725755ab67f3198df3b5bf7517f926f310ca h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/media/video/s2255drv.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 089bed86b0bd..b7e88c70f9a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78c948ab0cc44f9c8ae397d7d9d217bb498bfa2f
+refs/heads/master: 1f95725755ab67f3198df3b5bf7517f926f310ca
diff --git a/trunk/drivers/media/video/s2255drv.c b/trunk/drivers/media/video/s2255drv.c
index 9e3262c0ba37..2c0bb06cab3b 100644
--- a/trunk/drivers/media/video/s2255drv.c
+++ b/trunk/drivers/media/video/s2255drv.c
@@ -598,11 +598,6 @@ static int s2255_got_frame(struct s2255_dev *dev, int chn, int jpgsize)
 	buf = list_entry(dma_q->active.next,
 			 struct s2255_buffer, vb.queue);
 
-	if (!waitqueue_active(&buf->vb.done)) {
-		/* no one active */
-		rc = -1;
-		goto unlock;
-	}
 	list_del(&buf->vb.queue);
 	do_gettimeofday(&buf->vb.ts);
 	dprintk(100, "[%p/%d] wakeup\n", buf, buf->vb.i);