From 5ac71adc4090a342bb78742ccccc006a055dbed3 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Fri, 1 Feb 2008 23:09:34 +0100
Subject: [PATCH] --- yaml --- r: 82151 b: refs/heads/master c:
 cf7125ae05e5ac671eec2508656816bbc0a8c723 h: refs/heads/master i:   82149:
 4978a84a2725db48711918ee9abc8b7a773406c3   82147:
 e96795f9d7766bc730ab33bce75f7cf00de3ae0d   82143:
 24b94cc9de40369e81ad3044df7501783727050b v: v3

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

diff --git a/[refs] b/[refs]
index 81d614ac6dbc..9549a40a79df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76166952bbc81dda1c8a8c14e75a2aa06f6c052c
+refs/heads/master: cf7125ae05e5ac671eec2508656816bbc0a8c723
diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c
index 21672001a8ad..873471dfb9b3 100644
--- a/trunk/drivers/ide/ide-probe.c
+++ b/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;	
 	}