diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
| commit | f315ccb3e679f271583f2a4f463ad9b65665b751 (patch) | |
| tree | 44eb52102587d7b0bb592464cef6ec04bcac8b90 /drivers/ide/ide-lib.c | |
| parent | ead03e30b050d6dda769e7e9b071c5fa720bf8d2 (diff) | |
| parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ide/ide-lib.c')
| -rw-r--r-- | drivers/ide/ide-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c index b42940d8bf70..1ff676cc6473 100644 --- a/drivers/ide/ide-lib.c +++ b/drivers/ide/ide-lib.c | |||
| @@ -578,7 +578,7 @@ u8 ide_dump_status(ide_drive_t *drive, const char *msg, u8 stat) | |||
| 578 | } | 578 | } |
| 579 | printk("}\n"); | 579 | printk("}\n"); |
| 580 | if ((stat & (BUSY_STAT|ERR_STAT)) == ERR_STAT) { | 580 | if ((stat & (BUSY_STAT|ERR_STAT)) == ERR_STAT) { |
| 581 | err = drive->hwif->INB(IDE_ERROR_REG); | 581 | err = ide_read_error(drive); |
| 582 | printk("%s: %s: error=0x%02x ", drive->name, msg, err); | 582 | printk("%s: %s: error=0x%02x ", drive->name, msg, err); |
| 583 | if (drive->media == ide_disk) | 583 | if (drive->media == ide_disk) |
| 584 | ide_dump_ata_error(drive, err); | 584 | ide_dump_ata_error(drive, err); |