Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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;
			}