diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-23 13:55:56 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-23 13:55:56 -0400 |
commit | edc74b247bedb3a1f80eb6371d4171f2d49c1c77 (patch) | |
tree | ecea50c3a7a6691a93f7edea892c6fd1dcbfdf8f /drivers/ide | |
parent | 73dc532bc1eebe3bff6b918c5685a219eae27f97 (diff) |
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')
-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) | |||
118 | continue; | 118 | continue; |
119 | } | 119 | } |
120 | 120 | ||
121 | /* | ||
122 | * Skip probing if the corresponding | ||
123 | * slot is already occupied. | ||
124 | */ | ||
125 | hwif = ide_find_port(); | 121 | hwif = ide_find_port(); |
126 | if (hwif == NULL || hwif->index != i) { | 122 | if (hwif == NULL) |
127 | idx[i] = 0xff; | ||
128 | continue; | 123 | continue; |
129 | } | ||
130 | 124 | ||
131 | hwif->chipset = ide_generic; | 125 | hwif->chipset = ide_generic; |
132 | 126 | ||