diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-02-20 13:27:26 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-02-20 13:27:26 -0500 |
| commit | 23bf8bba8519a2d1e4103a36860d96053c61efdd (patch) | |
| tree | c88252a3ba56e0d12705b361ef3a22463fc8ba31 /drivers/ide/ide-io.c | |
| parent | 07087a3fbc4521b3bdd89021520ae38af02d8baf (diff) | |
| parent | c0d51c67f9c398279a95c5a7df387f2d9a586c98 (diff) | |
Merge modernduck.com:/usr/src/bk/linux-2.5
into modernduck.com:/usr/src/bk/1394-2.6
Diffstat (limited to 'drivers/ide/ide-io.c')
| -rw-r--r-- | drivers/ide/ide-io.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 04705878fea6..3cf32f23bea2 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -238,9 +238,10 @@ u64 ide_get_error_location(ide_drive_t *drive, char *args) high = ide_read_24(drive); } else { u8 cur = HWIF(drive)->INB(IDE_SELECT_REG); - if (cur & 0x40) + if (cur & 0x40) { + high = cur & 0xf; low = (hcyl << 16) | (lcyl << 8) | sect; - else { + } else { low = hcyl * drive->head * drive->sect; low += lcyl * drive->sect; low += sect - 1; |