There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
---
drivers/ide/ide-generic.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
Index: b/drivers/ide/ide-generic.c
===================================================================
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -90,18 +90,27 @@ static int __init ide_generic_init(void)
int i;
for (i = 0; i < MAX_HWIFS; i++) {
- ide_hwif_t *hwif = &ide_hwifs[i];
+ ide_hwif_t *hwif;
unsigned long io_addr = ide_default_io_base(i);
hw_regs_t hw;
- if (hwif->chipset == ide_unknown && io_addr) {
- u8 oldnoprobe = hwif->noprobe;
+ if (io_addr) {
+ u8 oldnoprobe;
+
+ /*
+ * Skip probing if the corresponding
+ * slot entry is already occupied.
+ */
+ hwif = ide_find_port();
+ if (hwif == NULL || hwif->index != i)
+ continue;
memset(&hw, 0, sizeof(hw));
ide_std_init_ports(&hw, io_addr, io_addr + 0x206);
hw.irq = ide_default_irq(io_addr);
- ide_init_port_hw(hwif, &hw);
+ oldnoprobe = hwif->noprobe;
+ ide_init_port_hw(hwif, &hw);
hwif->noprobe = oldnoprobe;
idx[i] = i;
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
