---

yaml --- r: 112863 b: refs/heads/master c: dd8f46f h: refs/heads/master i: 112861: 812b491 112859: a453f9e 112855: 069a380 112847: 486aa9b 112831: 903181d v: v3
git-mirror · Oct 10, 2008 · da76ba7 · da76ba7
1 parent 12b0aa4
commit da76ba7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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];