Commit 04cc6976 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-2.6.37/misc' of git://git.kernel.dk/linux-2.6-block

* 'for-2.6.37/misc' of git://git.kernel.dk/linux-2.6-block:
  pipe: fix failure to return error code on ->confirm()
parents a2887097 e5953cbd
...@@ -382,7 +382,7 @@ pipe_read(struct kiocb *iocb, const struct iovec *_iov, ...@@ -382,7 +382,7 @@ pipe_read(struct kiocb *iocb, const struct iovec *_iov,
error = ops->confirm(pipe, buf); error = ops->confirm(pipe, buf);
if (error) { if (error) {
if (!ret) if (!ret)
error = ret; ret = error;
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment