1 files changed, 5 insertions, 0 deletions

diff --git a/arch/powerpc/platforms/cell/spufs/sputrace.c b/arch/powerpc/platforms/cell/spufs/sputrace.c
index 50cae0cf0988..a2460e2e1928 100644
--- a/arch/powerpc/platforms/cell/spufs/sputrace.c
+++ b/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)