From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Wed, 23 Jul 2008 17:55:56 +0000 (+0200)
Subject: ide-generic: probing fix
X-Git-Tag: v2.6.27-rc1~854^2~30
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=edc74b247bedb3a1f80eb6371d4171f2d49c1c77;p=linux-2.6-omap-h63xx.git

ide-generic: probing fix

* Don't skip probing IDE port if the corresponding ide_hwifs[] slot
  is already occupied.

* Remove duplicate idx[i] assignment.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---

diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index bb9fc905d60..a5c352abff5 100644
--- a/drivers/ide/ide-generic.c
+++ b/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;