aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cdrom
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/cdrom')
-rw-r--r--drivers/cdrom/gdrom.c2
-rw-r--r--drivers/cdrom/viocd.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 03c71f7698cb..7c05ddc63ae8 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -643,7 +643,7 @@ static void gdrom_request(struct request_queue *rq)
643 struct request *req; 643 struct request *req;
644 644
645 while ((req = blk_fetch_request(rq)) != NULL) { 645 while ((req = blk_fetch_request(rq)) != NULL) {
646 if (!blk_fs_request(req)) { 646 if (req->cmd_type != REQ_TYPE_FS) {
647 printk(KERN_DEBUG "GDROM: Non-fs request ignored\n"); 647 printk(KERN_DEBUG "GDROM: Non-fs request ignored\n");
648 __blk_end_request_all(req, -EIO); 648 __blk_end_request_all(req, -EIO);
649 continue; 649 continue;
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index 451cd7071b1d..14e420168764 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -298,7 +298,7 @@ static void do_viocd_request(struct request_queue *q)
298 struct request *req; 298 struct request *req;
299 299
300 while ((rwreq == 0) && ((req = blk_fetch_request(q)) != NULL)) { 300 while ((rwreq == 0) && ((req = blk_fetch_request(q)) != NULL)) {
301 if (!blk_fs_request(req)) 301 if (req->cmd_type != REQ_TYPE_FS)
302 __blk_end_request_all(req, -EIO); 302 __blk_end_request_all(req, -EIO);
303 else if (send_request(req) < 0) { 303 else if (send_request(req) < 0) {
304 printk(VIOCD_KERN_WARNING 304 printk(VIOCD_KERN_WARNING