[PATCH] videobuf_waiton race fix

There's a window in this function where a wakeup can get lost.

[PATCH] videobuf_waiton race fix
There's a window in this function where a wakeup can get lost.
d4680c6f · Andrew Morton · Linus Torvalds · ce323807 · d4680c6f
Commit d4680c6f authored Nov 18, 2003 by Andrew Morton Committed by Linus Torvalds Nov 18, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

drivers/media/video/video-buf.c drivers/media/video/video-buf.c +6 -4

No files found.
--- a/drivers/media/video/video-buf.c
+++ b/drivers/media/video/video-buf.c
@@ -320,14 +320,16 @@ int videobuf_waiton(struct videobuf_buffer *vb, int non_blocking, int intr)
 	DECLARE_WAITQUEUE(wait, current);
 	add_wait_queue(&vb->done, &wait);
-	while (vb->state == STATE_ACTIVE ||
+	while (vb->state == STATE_ACTIVE || vb->state == STATE_QUEUED) {
-	       vb->state == STATE_QUEUED) {
 		if (non_blocking) {
 			retval = -EAGAIN;
 			break;
 		}
-		current->state = intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE;
+		set_current_state(intr ? TASK_INTERRUPTIBLE :
-		schedule();
+					TASK_UNINTERRUPTIBLE);
+		if (vb->state == STATE_ACTIVE || vb->state == STATE_QUEUED)
+			schedule();
+		set_current_state(TASK_RUNNING);
 		if (intr && signal_pending(current)) {
 			dprintk(1,"buffer waiton: -EINTR\n");
 			retval = -EINTR;