git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
a288709
)
Merge branch 'for-2.6.37/misc' of git://git.kernel.dk/linux-2.6-block
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 23 Oct 2010 00:07:56 +0000
(17:07 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 23 Oct 2010 00:07:56 +0000
(17:07 -0700)
* 'for-2.6.37/misc' of git://git.kernel.dk/linux-2.6-block:
pipe: fix failure to return error code on ->confirm()
fs/pipe.c
patch
|
blob
|
history
diff --git
a/fs/pipe.c
b/fs/pipe.c
index
279eef9
..
37eb1eb
100644
(file)
--- a/
fs/pipe.c
+++ b/
fs/pipe.c
@@
-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;
}