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 bb9fc905d60ca9ffba960c32977915bc74a81818..a5c352abff59eca162b8f1fa9bec127d0ef62221 100644 (file)
--- 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;