Merge tag 'v3.10.102' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 43267f734606a690a6ccedbb17c14be9f3f465cb..21a8cfa141db996dfd700730c09c7a3693f7ef38 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4543,7 +4543,10 @@ static ssize_t tracing_splice_read_pipe(struct file *filp,
 
        spd.nr_pages = i;
 
-       ret = splice_to_pipe(pipe, &spd);
+       if (i)
+               ret = splice_to_pipe(pipe, &spd);
+       else
+               ret = 0;
 out:
        splice_shrink_spd(&spd);
        return ret;