diff options
Diffstat (limited to 'drivers/ide/ide-cd.c')
-rw-r--r-- | drivers/ide/ide-cd.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 081aed6781cc..1799328decfb 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -283,7 +283,6 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) | |||
283 | ide_hwif_t *hwif = drive->hwif; | 283 | ide_hwif_t *hwif = drive->hwif; |
284 | struct request *rq = hwif->rq; | 284 | struct request *rq = hwif->rq; |
285 | int err, sense_key, do_end_request = 0; | 285 | int err, sense_key, do_end_request = 0; |
286 | u8 quiet = rq->cmd_flags & REQ_QUIET; | ||
287 | 286 | ||
288 | /* get the IDE error register */ | 287 | /* get the IDE error register */ |
289 | err = ide_read_error(drive); | 288 | err = ide_read_error(drive); |
@@ -318,7 +317,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) | |||
318 | } else { | 317 | } else { |
319 | cdrom_saw_media_change(drive); | 318 | cdrom_saw_media_change(drive); |
320 | 319 | ||
321 | if (blk_fs_request(rq) && !quiet) | 320 | if (blk_fs_request(rq) && !blk_rq_quiet(rq)) |
322 | printk(KERN_ERR PFX "%s: tray open\n", | 321 | printk(KERN_ERR PFX "%s: tray open\n", |
323 | drive->name); | 322 | drive->name); |
324 | } | 323 | } |
@@ -353,7 +352,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) | |||
353 | * No point in retrying after an illegal request or data | 352 | * No point in retrying after an illegal request or data |
354 | * protect error. | 353 | * protect error. |
355 | */ | 354 | */ |
356 | if (!quiet) | 355 | if (!blk_rq_quiet(rq)) |
357 | ide_dump_status(drive, "command error", stat); | 356 | ide_dump_status(drive, "command error", stat); |
358 | do_end_request = 1; | 357 | do_end_request = 1; |
359 | break; | 358 | break; |
@@ -362,14 +361,14 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) | |||
362 | * No point in re-trying a zillion times on a bad sector. | 361 | * No point in re-trying a zillion times on a bad sector. |
363 | * If we got here the error is not correctable. | 362 | * If we got here the error is not correctable. |
364 | */ | 363 | */ |
365 | if (!quiet) | 364 | if (!blk_rq_quiet(rq)) |
366 | ide_dump_status(drive, "media error " | 365 | ide_dump_status(drive, "media error " |
367 | "(bad sector)", stat); | 366 | "(bad sector)", stat); |
368 | do_end_request = 1; | 367 | do_end_request = 1; |
369 | break; | 368 | break; |
370 | case BLANK_CHECK: | 369 | case BLANK_CHECK: |
371 | /* disk appears blank? */ | 370 | /* disk appears blank? */ |
372 | if (!quiet) | 371 | if (!blk_rq_quiet(rq)) |
373 | ide_dump_status(drive, "media error (blank)", | 372 | ide_dump_status(drive, "media error (blank)", |
374 | stat); | 373 | stat); |
375 | do_end_request = 1; | 374 | do_end_request = 1; |