From 717f3c3849674ed5a1bc95c5b7cb95a28660c73e Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Wed, 23 Jul 2008 19:55:56 +0200
Subject: [PATCH] --- yaml --- r: 105016 b: refs/heads/master c:
 edc74b247bedb3a1f80eb6371d4171f2d49c1c77 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 853fb05e826f..357a9affe26f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73dc532bc1eebe3bff6b918c5685a219eae27f97
+refs/heads/master: edc74b247bedb3a1f80eb6371d4171f2d49c1c77
diff --git a/trunk/drivers/ide/ide-generic.c b/trunk/drivers/ide/ide-generic.c
index bb9fc905d60c..a5c352abff59 100644
--- a/trunk/drivers/ide/ide-generic.c
+++ b/trunk/drivers/ide/ide-generic.c
@@ -118,15 +118,9 @@ static int __init ide_generic_init(void)
 				continue;
 			}
 
-			/*
-			 * Skip probing if the corresponding
-			 * slot is already occupied.
-			 */
 			hwif = ide_find_port();
-			if (hwif == NULL || hwif->index != i) {
-				idx[i] = 0xff;
+			if (hwif == NULL)
 				continue;
-			}
 
 			hwif->chipset = ide_generic;