---

yaml --- r: 168392 b: refs/heads/master c: 1f95725 h: refs/heads/master v: v3
git-mirror · Nov 7, 2009 · 844a753 · 844a753
1 parent 1266e20
commit 844a753
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -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);