Skip to content

Commit

Permalink
ide-generic: probing fix
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Jul 23, 2008
1 parent 73dc532 commit edc74b2
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/ide/ide-generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit edc74b2

Please sign in to comment.