1 files changed, 20 insertions, 14 deletions

diff --git a/drivers/ide/legacy/ide-4drives.c b/drivers/ide/legacy/ide-4drives.c
index ecd7f355355..d7bc94f94a3 100644
--- a/drivers/ide/legacy/ide-4drives.c
+++ b/drivers/ide/legacy/ide-4drives.c
@@ -12,31 +12,37 @@ MODULE_PARM_DESC(probe, "probe for generic IDE chipset with 4 drives/port");
 static int __init ide_4drives_init(void)
 {
         ide_hwif_t *hwif, *mate;
-        u8 idx[4] = { 0, 1, 0xff, 0xff };
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
         hw_regs_t hw;
 
         if (probe_4drives == 0)
                 return -ENODEV;
 
-        hwif = &ide_hwifs[0];
-        mate = &ide_hwifs[1];
-
         memset(&hw, 0, sizeof(hw));
 
         ide_std_init_ports(&hw, 0x1f0, 0x3f6);
         hw.irq = 14;
         hw.chipset = ide_4drives;
 
-        ide_init_port_hw(hwif, &hw);
-        ide_init_port_hw(mate, &hw);
-
-        mate->drives[0].select.all ^= 0x20;
-        mate->drives[1].select.all ^= 0x20;
-
-        hwif->mate = mate;
-        mate->mate = hwif;
-
-        hwif->serialized = mate->serialized = 1;
+        hwif = ide_find_port();
+        if (hwif) {
+                ide_init_port_hw(hwif, &hw);
+                idx[0] = hwif->index;
+        }
+
+        mate = ide_find_port();
+        if (mate) {
+                ide_init_port_hw(mate, &hw);
+                mate->drives[0].select.all ^= 0x20;
+                mate->drives[1].select.all ^= 0x20;
+                idx[1] = mate->index;
+
+                if (hwif) {
+                        hwif->mate = mate;
+                        mate->mate = hwif;
+                        hwif->serialized = mate->serialized = 1;
+                }
+        }
 
         ide_device_add(idx, NULL);