diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-23 19:55:56 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-23 19:55:56 +0200 |
| commit | edc74b247bedb3a1f80eb6371d4171f2d49c1c77 (patch) | |
| tree | ecea50c3a7a6691a93f7edea892c6fd1dcbfdf8f /drivers/ide/ide-generic.c | |
| parent | gayle: reserve memory resources at once (diff) | |
| download | linux-edc74b247bedb3a1f80eb6371d4171f2d49c1c77.tar.xz linux-edc74b247bedb3a1f80eb6371d4171f2d49c1c77.zip | |
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>
Diffstat (limited to 'drivers/ide/ide-generic.c')
| -rw-r--r-- | drivers/ide/ide-generic.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c index bb9fc905d60c..a5c352abff59 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; |