commit 707abb7986293b24b83dba163ffc79d8895236f9
author Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Apr 25 13:51:21 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Apr 25 13:51:21 2007 -0700
tree e5f9d226ef9d864a11cfcc1df1fcd33ea0447523
parent cbc31a475a7f7748bd0a4e536533868e7cff8645
parent 1194ed0a3eb8076c8fbfe310f1ccbf229e8647de

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NETLINK]: Infinite recursion in netlink.

drivers/block/pktcdvd.c

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index a4fb703..f1b9dd7 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -777,7 +777,8 @@
 		rq->cmd_flags |= REQ_QUIET;
 
 	blk_execute_rq(rq->q, pd->bdev->bd_disk, rq, 0);
-	ret = rq->errors;
+	if (rq->errors)
+		ret = -EIO;
 out:
 	blk_put_request(rq);
 	return ret;