summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-cd.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2010-06-19 17:26:47 +0200
committerJens Axboe <jaxboe@fusionio.com>2010-08-07 18:22:29 +0200
commit4c4762d10faf93167b84ee03e4b58dd62012b06f (patch)
tree5819c7acb3e457885e77edf124196e62b09fd387 /drivers/ide/ide-cd.c
parent15fa6e81650a167f82dc0d478f290f1cffa9183d (diff)
downloadlinux-4c4762d10faf93167b84ee03e4b58dd62012b06f.tar.gz
linux-4c4762d10faf93167b84ee03e4b58dd62012b06f.tar.bz2
linux-4c4762d10faf93167b84ee03e4b58dd62012b06f.zip
block: fix some more cmd_type cleanup fallout
Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/ide/ide-cd.c')
-rw-r--r--drivers/ide/ide-cd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 26a3688de467..ef7e3a9bee51 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -318,7 +318,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)
cdrom_saw_media_change(drive);
if (rq->cmd_type == REQ_TYPE_FS &&
- !(rq->cmd_flags & REQ_QUIET)) {
+ !(rq->cmd_flags & REQ_QUIET))
printk(KERN_ERR PFX "%s: tray open\n",
drive->name);
}
@@ -375,7 +375,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)
do_end_request = 1;
break;
default:
- if (req->cmd_type != REQ_TYPE_FS)
+ if (rq->cmd_type != REQ_TYPE_FS)
break;
if (err & ~ATA_ABORTED) {
/* go to the default handler for other errors */