---

yaml --- r: 202100 b: refs/heads/master c: 02bbcb9 h: refs/heads/master v: v3
git-mirror · Aug 2, 2010 · 068f5bb · 068f5bb
1 parent cd98e06
commit 068f5bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9059cd44403608f6554b37c3b3d5598ded7a3a92
+refs/heads/master: 02bbcb9d863df10b5a4b91ba5b4c76eaf1340883
diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
@@ -466,8 +466,9 @@ void gspca_frame_add(struct gspca_dev *gspca_dev,
 		j = gspca_dev->fr_queue[i];
 		frame = &gspca_dev->frame[j];
 		frame->v4l2_buf.bytesused = gspca_dev->image_len;
-		frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_QUEUED;
-		frame->v4l2_buf.flags |= V4L2_BUF_FLAG_DONE;
+		frame->v4l2_buf.flags = (frame->v4l2_buf.flags
+					 | V4L2_BUF_FLAG_DONE)
+					& ~V4L2_BUF_FLAG_QUEUED;
 		wake_up_interruptible(&gspca_dev->wq);	/* event = new frame */
 		i = (i + 1) % gspca_dev->nframes;
 		gspca_dev->fr_i = i;