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()
This commit is contained in:
commit
04cc69768e
1 changed files with 1 additions and 1 deletions
|
@ -382,7 +382,7 @@ pipe_read(struct kiocb *iocb, const struct iovec *_iov,
|
|||
error = ops->confirm(pipe, buf);
|
||||
if (error) {
|
||||
if (!ret)
|
||||
error = ret;
|
||||
ret = error;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue