Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 1f79b87..a1b9afd 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3244,8 +3244,6 @@ tracing_poll_pipe(struct file *filp, poll_table *poll_table)
                 */
                return POLLIN | POLLRDNORM;
        } else {
-               if (!trace_empty(iter))
-                       return POLLIN | POLLRDNORM;
                poll_wait(filp, &trace_wait, poll_table);
                if (!trace_empty(iter))
                        return POLLIN | POLLRDNORM;