1 files changed, 14 insertions, 5 deletions

diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index bc8b1f8de614..c9536dd268cd 100644
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -199,7 +199,8 @@ static const struct ide_port_info ali14xx_port_info = {
 
 static int __init ali14xx_probe(void)
 {
-        static u8 idx[4] = { 0, 1, 0xff, 0xff };
+        ide_hwif_t *hwif, *mate;
+        static u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
         hw_regs_t hw[2];
 
         printk(KERN_DEBUG "ali14xx: base=0x%03x, regOn=0x%02x.\n",
@@ -219,11 +220,19 @@ static int __init ali14xx_probe(void)
         ide_std_init_ports(&hw[1], 0x170, 0x376);
         hw[1].irq = 15;
 
-        ide_init_port_hw(&ide_hwifs[0], &hw[0]);
-        ide_init_port_hw(&ide_hwifs[1], &hw[1]);
+        hwif = ide_find_port();
+        if (hwif) {
+                ide_init_port_hw(hwif, &hw[0]);
+                hwif->set_pio_mode = &ali14xx_set_pio_mode;
+                idx[0] = hwif->index;
+        }
 
-        ide_hwifs[0].set_pio_mode = &ali14xx_set_pio_mode;
-        ide_hwifs[1].set_pio_mode = &ali14xx_set_pio_mode;
+        mate = ide_find_port();
+        if (mate) {
+                ide_init_port_hw(mate, &hw[1]);
+                mate->set_pio_mode = &ali14xx_set_pio_mode;
+                idx[1] = mate->index;
+        }
 
         ide_device_add(idx, &ali14xx_port_info);