diff options
Diffstat (limited to 'drivers/ide/legacy/umc8672.c')
-rw-r--r-- | drivers/ide/legacy/umc8672.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c index ef768a84be9..43ee632a6da 100644 --- a/drivers/ide/legacy/umc8672.c +++ b/drivers/ide/legacy/umc8672.c | |||
@@ -128,8 +128,9 @@ static const struct ide_port_info umc8672_port_info __initdata = { | |||
128 | 128 | ||
129 | static int __init umc8672_probe(void) | 129 | static int __init umc8672_probe(void) |
130 | { | 130 | { |
131 | ide_hwif_t *hwif, *mate; | ||
131 | unsigned long flags; | 132 | unsigned long flags; |
132 | static u8 idx[4] = { 0, 1, 0xff, 0xff }; | 133 | static u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; |
133 | hw_regs_t hw[2]; | 134 | hw_regs_t hw[2]; |
134 | 135 | ||
135 | if (!request_region(0x108, 2, "umc8672")) { | 136 | if (!request_region(0x108, 2, "umc8672")) { |
@@ -157,11 +158,19 @@ static int __init umc8672_probe(void) | |||
157 | ide_std_init_ports(&hw[1], 0x170, 0x376); | 158 | ide_std_init_ports(&hw[1], 0x170, 0x376); |
158 | hw[1].irq = 15; | 159 | hw[1].irq = 15; |
159 | 160 | ||
160 | ide_init_port_hw(&ide_hwifs[0], &hw[0]); | 161 | hwif = ide_find_port(); |
161 | ide_init_port_hw(&ide_hwifs[1], &hw[1]); | 162 | if (hwif) { |
163 | ide_init_port_hw(hwif, &hw[0]); | ||
164 | hwif->set_pio_mode = umc_set_pio_mode; | ||
165 | idx[0] = hwif->index; | ||
166 | } | ||
162 | 167 | ||
163 | ide_hwifs[0].set_pio_mode = &umc_set_pio_mode; | 168 | mate = ide_find_port(); |
164 | ide_hwifs[1].set_pio_mode = &umc_set_pio_mode; | 169 | if (mate) { |
170 | ide_init_port_hw(mate, &hw[1]); | ||
171 | mate->set_pio_mode = umc_set_pio_mode; | ||
172 | idx[1] = mate->index; | ||
173 | } | ||
165 | 174 | ||
166 | ide_device_add(idx, &umc8672_port_info); | 175 | ide_device_add(idx, &umc8672_port_info); |
167 | 176 | ||