---

yaml
---
r: 112859
b: refs/heads/master
c: df1f837
h: refs/heads/master
i:
  112857: 50b2ca9
  112855: 069a380
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8881000d7cc6b8b520e8fcba95177d2cde1ae36
+refs/heads/master: df1f8378c2fd898fa08be5d72283d68c77f519e9

trunk/drivers/ide/ide-probe.c

@@ -89,20 +89,19 @@ static void ide_disk_init_mult_count(ide_drive_t *drive)
 {
 	struct hd_driveid *id = drive->id;
 
-	drive->mult_count = 0;
 	if (id->max_multsect) {
 #ifdef CONFIG_IDEDISK_MULTI_MODE
-		id->multsect = ((id->max_multsect/2) > 1) ? id->max_multsect : 0;
-		id->multsect_valid = id->multsect ? 1 : 0;
-		drive->mult_req = id->multsect_valid ? id->max_multsect : 0;
-		drive->special.b.set_multmode = drive->mult_req ? 1 : 0;
-#else	/* original, pre IDE-NFG, per request of AC */
-		drive->mult_req = 0;
-		if (drive->mult_req > id->max_multsect)
-			drive->mult_req = id->max_multsect;
-		if (drive->mult_req || ((id->multsect_valid & 1) && id->multsect))
-			drive->special.b.set_multmode = 1;
+		if ((id->max_multsect / 2) > 1) {
+			id->multsect = id->max_multsect;
+			id->multsect_valid = 1;
+		} else {
+			id->multsect = 0;
+			id->multsect_valid = 0;
+		}
+		drive->mult_req = id->multsect;
 #endif
+		if ((id->multsect_valid & 1) && id->multsect)
+			drive->special.b.set_multmode = 1;
 	}
 }