diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-02 19:48:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-02 19:48:32 -0400 |
commit | 7b39da786a63e82d9d440075eae9018b79154d2a (patch) | |
tree | e0c415aa911136293d50e0116bafdc5128bd4080 /drivers/ide/ide-cd.c | |
parent | 2142babac999a5ba169348892a8e3ac222bec7a4 (diff) | |
parent | 96c16743973e8c1a7b9c655d10b7973408d6d1dd (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide-cd: fix REQ_QUIET tests in cdrom_decode_status
Fix up trivial conflicts in include/linux/blkdev.h
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 3d4e09969763..925eb9e245d1 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -312,7 +312,6 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) | |||
312 | ide_hwif_t *hwif = drive->hwif; | 312 | ide_hwif_t *hwif = drive->hwif; |
313 | struct request *rq = hwif->rq; | 313 | struct request *rq = hwif->rq; |
314 | int err, sense_key, do_end_request = 0; | 314 | int err, sense_key, do_end_request = 0; |
315 | u8 quiet = rq->cmd_flags & REQ_QUIET; | ||
316 | 315 | ||
317 | /* get the IDE error register */ | 316 | /* get the IDE error register */ |
318 | err = ide_read_error(drive); | 317 | err = ide_read_error(drive); |
@@ -347,7 +346,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) | |||
347 | } else { | 346 | } else { |
348 | cdrom_saw_media_change(drive); | 347 | cdrom_saw_media_change(drive); |
349 | 348 | ||
350 | if (blk_fs_request(rq) && !quiet) | 349 | if (blk_fs_request(rq) && !blk_rq_quiet(rq)) |
351 | printk(KERN_ERR PFX "%s: tray open\n", | 350 | printk(KERN_ERR PFX "%s: tray open\n", |
352 | drive->name); | 351 | drive->name); |
353 | } | 352 | } |
@@ -382,7 +381,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) | |||
382 | * No point in retrying after an illegal request or data | 381 | * No point in retrying after an illegal request or data |
383 | * protect error. | 382 | * protect error. |
384 | */ | 383 | */ |
385 | if (!quiet) | 384 | if (!blk_rq_quiet(rq)) |
386 | ide_dump_status(drive, "command error", stat); | 385 | ide_dump_status(drive, "command error", stat); |
387 | do_end_request = 1; | 386 | do_end_request = 1; |
388 | break; | 387 | break; |
@@ -391,14 +390,14 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) | |||
391 | * No point in re-trying a zillion times on a bad sector. | 390 | * No point in re-trying a zillion times on a bad sector. |
392 | * If we got here the error is not correctable. | 391 | * If we got here the error is not correctable. |
393 | */ | 392 | */ |
394 | if (!quiet) | 393 | if (!blk_rq_quiet(rq)) |
395 | ide_dump_status(drive, "media error " | 394 | ide_dump_status(drive, "media error " |
396 | "(bad sector)", stat); | 395 | "(bad sector)", stat); |
397 | do_end_request = 1; | 396 | do_end_request = 1; |
398 | break; | 397 | break; |
399 | case BLANK_CHECK: | 398 | case BLANK_CHECK: |
400 | /* disk appears blank? */ | 399 | /* disk appears blank? */ |
401 | if (!quiet) | 400 | if (!blk_rq_quiet(rq)) |
402 | ide_dump_status(drive, "media error (blank)", | 401 | ide_dump_status(drive, "media error (blank)", |
403 | stat); | 402 | stat); |
404 | do_end_request = 1; | 403 | do_end_request = 1; |