aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cdrom
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/cdrom')
-rw-r--r--drivers/cdrom/gdrom.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index fee9a9e83fc9..cab2b1fb2fe7 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -654,17 +654,17 @@ static void gdrom_request(struct request_queue *rq)
654 while ((req = elv_next_request(rq)) != NULL) { 654 while ((req = elv_next_request(rq)) != NULL) {
655 if (!blk_fs_request(req)) { 655 if (!blk_fs_request(req)) {
656 printk(KERN_DEBUG "GDROM: Non-fs request ignored\n"); 656 printk(KERN_DEBUG "GDROM: Non-fs request ignored\n");
657 end_request(req, 0); 657 __blk_end_request_cur(req, -EIO);
658 } 658 }
659 if (rq_data_dir(req) != READ) { 659 if (rq_data_dir(req) != READ) {
660 printk(KERN_NOTICE "GDROM: Read only device -"); 660 printk(KERN_NOTICE "GDROM: Read only device -");
661 printk(" write request ignored\n"); 661 printk(" write request ignored\n");
662 end_request(req, 0); 662 __blk_end_request_cur(req, -EIO);
663 } 663 }
664 if (req->nr_sectors) 664 if (req->nr_sectors)
665 gdrom_request_handler_dma(req); 665 gdrom_request_handler_dma(req);
666 else 666 else
667 end_request(req, 0); 667 __blk_end_request_cur(req, -EIO);
668 } 668 }
669} 669}
670 670