Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux

[karo-tx-linux.git] / fs / pipe.c

diff --git a/fs/pipe.c b/fs/pipe.c
index 95ebb56de494de44efb6224ccfee1b96e4169267..49c1065256fd10d9d5fdca3cf449b1e56bd58a0a 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -654,8 +654,11 @@ out:
                wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLRDNORM);
                kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
        }
-       if (ret > 0)
-               file_update_time(filp);
+       if (ret > 0) {
+               int err = file_update_time(filp);
+               if (err)
+                       ret = err;
+       }
        return ret;
 }