diff options
author | Christoph Hellwig <hch@lst.de> | 2010-06-19 11:26:47 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-07 12:22:29 -0400 |
commit | 4c4762d10faf93167b84ee03e4b58dd62012b06f (patch) | |
tree | 5819c7acb3e457885e77edf124196e62b09fd387 /drivers/ide/ide-cd.c | |
parent | 15fa6e81650a167f82dc0d478f290f1cffa9183d (diff) |
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.c | 4 |
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) | |||
318 | cdrom_saw_media_change(drive); | 318 | cdrom_saw_media_change(drive); |
319 | 319 | ||
320 | if (rq->cmd_type == REQ_TYPE_FS && | 320 | if (rq->cmd_type == REQ_TYPE_FS && |
321 | !(rq->cmd_flags & REQ_QUIET)) { | 321 | !(rq->cmd_flags & REQ_QUIET)) |
322 | printk(KERN_ERR PFX "%s: tray open\n", | 322 | printk(KERN_ERR PFX "%s: tray open\n", |
323 | drive->name); | 323 | drive->name); |
324 | } | 324 | } |
@@ -375,7 +375,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) | |||
375 | do_end_request = 1; | 375 | do_end_request = 1; |
376 | break; | 376 | break; |
377 | default: | 377 | default: |
378 | if (req->cmd_type != REQ_TYPE_FS) | 378 | if (rq->cmd_type != REQ_TYPE_FS) |
379 | break; | 379 | break; |
380 | if (err & ~ATA_ABORTED) { | 380 | if (err & ~ATA_ABORTED) { |
381 | /* go to the default handler for other errors */ | 381 | /* go to the default handler for other errors */ |