X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=kernel%2Frelay.c;h=09ac2008f77b419a5c169e41f3ddcbab6aa90746;hb=fbb5b7ae4b442f1923513dc6165a66c7a7f29073;hp=32b0befdcb6a6cba585cb555d9db4a87246d9468;hpb=361371201b60ffd686a694c848c1d5ad6061725f;p=linux-2.6-omap-h63xx.git

diff --git a/kernel/relay.c b/kernel/relay.c
index 32b0befdcb6..09ac2008f77 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -1317,12 +1317,9 @@ static ssize_t relay_file_splice_read(struct file *in,
 		if (ret < 0)
 			break;
 		else if (!ret) {
-			if (spliced)
-				break;
-			if (flags & SPLICE_F_NONBLOCK) {
+			if (flags & SPLICE_F_NONBLOCK)
 				ret = -EAGAIN;
-				break;
-			}
+			break;
 		}
 
 		*ppos += ret;