Commit df96aa84 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ppc64: iSeries virtual cd fix

From: Stephen Rothwell <sfr@canb.auug.org.au>

This patch stops an oops caused by certain ioctls being performed on the
virtual cdrom.  In particular, the eject and tray close operations were
affected.
parent 2881875e
...@@ -338,8 +338,9 @@ static void do_viocd_request(request_queue_t *q) ...@@ -338,8 +338,9 @@ static void do_viocd_request(request_queue_t *q)
struct request *req; struct request *req;
while ((rwreq == 0) && ((req = elv_next_request(q)) != NULL)) { while ((rwreq == 0) && ((req = elv_next_request(q)) != NULL)) {
/* check for any kind of error */ if (!blk_fs_request(req))
if (send_request(req) < 0) { end_request(req, 0);
else if (send_request(req) < 0) {
printk(VIOCD_KERN_WARNING printk(VIOCD_KERN_WARNING
"unable to send message to OS/400!"); "unable to send message to OS/400!");
end_request(req, 0); end_request(req, 0);
......
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