[PATCH 1/4] ide-generic: probing fix

Bartlomiej Zolnierkiewicz
2008-06-22T19:33:59Z

* 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>
---
drivers/ide/ide-generic.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)

Index: b/drivers/ide/ide-generic.c
===================================================================
--- 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;