From da76ba7f76e31e619dc39b81b644e0802d16b868 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Fri, 10 Oct 2008 22:39:19 +0200
Subject: [PATCH] --- yaml --- r: 112863 b: refs/heads/master c:
 dd8f46f64ae66659df3358fad73ed7699aa729dd h: refs/heads/master i:   112861:
 812b49154be28d0ebfeca5a1aacc49d68fc3250a   112859:
 a453f9eac7e416fc2bd8795bddc88f270ae80626   112855:
 069a38082bd897eecce5eb20a7993827dfb32255   112847:
 486aa9b5c062490c033a2d7031f304537102f5fb   112831:
 903181db29e2325ccb82245a5088cfc49464e5cc v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/ide/ide-probe.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index de99e9d7bb2d..580e4483295f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48fb2688aa67baba373531cc4ed2d9e695983c3f
+refs/heads/master: dd8f46f64ae66659df3358fad73ed7699aa729dd
diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c
index 1bb4b2c0e2f4..2f105f4bbdec 100644
--- a/trunk/drivers/ide/ide-probe.c
+++ b/trunk/drivers/ide/ide-probe.c
@@ -69,9 +69,7 @@ static void ide_disk_init_chs(ide_drive_t *drive)
 	}
 
 	/* Handle logical geometry translation by the drive */
-	if ((id[ATA_ID_FIELD_VALID] & 1) && id[ATA_ID_CUR_CYLS] &&
-	    id[ATA_ID_CUR_HEADS] && id[ATA_ID_CUR_HEADS] <= 16 &&
-	    id[ATA_ID_CUR_SECTORS]) {
+	if (ata_id_current_chs_valid(id)) {
 		drive->cyl  = id[ATA_ID_CUR_CYLS];
 		drive->head = id[ATA_ID_CUR_HEADS];
 		drive->sect = id[ATA_ID_CUR_SECTORS];