---

yaml
---
r: 82151
b: refs/heads/master
c: cf7125a
h: refs/heads/master
i:
  82149: 4978a84
  82147: e96795f
  82143: 24b94cc
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76166952bbc81dda1c8a8c14e75a2aa06f6c052c
+refs/heads/master: cf7125ae05e5ac671eec2508656816bbc0a8c723

trunk/drivers/ide/ide-probe.c

@@ -727,18 +727,7 @@ static void probe_hwif(ide_hwif_t *hwif)
 
 	if ((hwif->chipset != ide_4drives || !hwif->mate || !hwif->mate->present) &&
 	    (ide_hwif_request_regions(hwif))) {
-		u16 msgout = 0;
-		for (unit = 0; unit < MAX_DRIVES; ++unit) {
-			ide_drive_t *drive = &hwif->drives[unit];
-			if (drive->present) {
-				drive->present = 0;
-				printk(KERN_ERR "%s: ERROR, PORTS ALREADY IN USE\n",
-					drive->name);
-				msgout = 1;
-			}
-		}
-		if (!msgout)
-			printk(KERN_ERR "%s: ports already in use, skipping probe\n",
+		printk(KERN_ERR "%s: ports already in use, skipping probe\n",
 				hwif->name);
 		return;	
 	}