summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-generic.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-23 19:55:56 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-23 19:55:56 +0200
commitedc74b247bedb3a1f80eb6371d4171f2d49c1c77 (patch)
treeecea50c3a7a6691a93f7edea892c6fd1dcbfdf8f /drivers/ide/ide-generic.c
parent73dc532bc1eebe3bff6b918c5685a219eae27f97 (diff)
downloadlinux-edc74b247bedb3a1f80eb6371d4171f2d49c1c77.tar.bz2
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.c8
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;