diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 106454211cb865c9417aaf198e7150fef04e4be0..38d6b15d6c47a7613fc76f89cb3daf316575ce6c 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -160,9 +160,9 @@ EXPORT_SYMBOL(default_hwif_mmiops);
 
 u32 ide_read_24 (ide_drive_t *drive)
 {
-	u8 hcyl = HWIF(drive)->INB(IDE_HCYL_REG);
-	u8 lcyl = HWIF(drive)->INB(IDE_LCYL_REG);
 	u8 sect = HWIF(drive)->INB(IDE_SECTOR_REG);
+	u8 lcyl = HWIF(drive)->INB(IDE_LCYL_REG);
+	u8 hcyl = HWIF(drive)->INB(IDE_HCYL_REG);
 	return (hcyl<<16)|(lcyl<<8)|sect;
 }
 
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 562f5efae9c6226d51dd60c9636a171d554f33f7..001085845a797f1c94c016f391e6656fecd021b2 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -524,19 +524,24 @@ static u8 ide_dump_ata_status(ide_drive_t *drive, const char *msg, u8 stat)
 				       (unsigned long long) sectors,
 				       high, low);
 			} else {
-				u8 cur = hwif->INB(IDE_SELECT_REG);
+				u8 sector, lcyl, hcyl, cur;
+
+				sector = hwif->INB(IDE_SECTOR_REG);
+				lcyl   = hwif->INB(IDE_LCYL_REG);
+				hcyl   = hwif->INB(IDE_HCYL_REG);
+				cur    = hwif->INB(IDE_SELECT_REG);
+
 				if (cur & 0x40) {	/* using LBA? */
 					printk(", LBAsect=%ld", (unsigned long)
-					 ((cur&0xf)<<24)
-					 |(hwif->INB(IDE_HCYL_REG)<<16)
-					 |(hwif->INB(IDE_LCYL_REG)<<8)
-					 | hwif->INB(IDE_SECTOR_REG));
+						((cur & 0xf) << 24) |
+						(hcyl << 16) |
+						(lcyl <<  8) |
+						sector);
 				} else {
 					printk(", CHS=%d/%d/%d",
-					 (hwif->INB(IDE_HCYL_REG)<<8) +
-					  hwif->INB(IDE_LCYL_REG),
-					  cur & 0xf,
-					  hwif->INB(IDE_SECTOR_REG));
+						(hcyl << 8) + lcyl,
+						cur & 0xf,
+						sector);
 				}
 			}
 			if (HWGROUP(drive) && HWGROUP(drive)->rq)