---

yaml --- r: 116913 b: refs/heads/master c: e869446 h: refs/heads/master i: 116911: 28ce50b v: v3
git-mirror · Oct 21, 2008 · 0c75b18 · 0c75b18
1 parent 9c4235e
commit 0c75b18
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baf399273f2ea38e2fcbd4d0b6cc7ba7f7db43eb
+refs/heads/master: e869446bb6db209e6092f7cba6cdfc2a5e637177
diff --git a/trunk/arch/powerpc/platforms/cell/spufs/sputrace.c b/trunk/arch/powerpc/platforms/cell/spufs/sputrace.c
@@ -80,6 +80,11 @@ static ssize_t sputrace_read(struct file *file, char __user *buf,
 		char tbuf[128];
 		int width;
 
+		/* If we have data ready to return, don't block waiting
+		 * for more */
+		if (cnt > 0 && sputrace_used() == 0)
+			break;
+
 		error = wait_event_interruptible(sputrace_wait,
 						 sputrace_used() > 0);
 		if (error)