V4L/DVB (7861): mt312: Prefix functions only with mt312_, Add zl10313 to kconfig...

[linux-2.6-omap-h63xx.git] / fs / splice.c

diff --git a/fs/splice.c b/fs/splice.c
index cece15b4ef72e4d82f08c76fa4a41ea9b3093318..78150038b58422155b2a89e47e8a228967f0ca3d 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1072,7 +1072,7 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
 
        ret = splice_direct_to_actor(in, &sd, direct_splice_actor);
        if (ret > 0)
-               *ppos = sd.pos;
+               *ppos += ret;
 
        return ret;
 }