aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ide/ide-probe.c4
-rw-r--r--drivers/ide/ide.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 21cea45e9f21..3cc8ade2cc4f 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1689,14 +1689,12 @@ static void ide_legacy_init_one(u8 *idx, hw_regs_t **hws, hw_regs_t *hw,
1689 ide_std_init_ports(hw, base, ctl); 1689 ide_std_init_ports(hw, base, ctl);
1690 hw->irq = irq; 1690 hw->irq = irq;
1691 hw->chipset = d->chipset; 1691 hw->chipset = d->chipset;
1692 hw->config = config;
1692 1693
1693 hwif = ide_find_port_slot(d); 1694 hwif = ide_find_port_slot(d);
1694 if (hwif) { 1695 if (hwif) {
1695 hwif->chipset = hw->chipset; 1696 hwif->chipset = hw->chipset;
1696 1697
1697 if (config)
1698 hwif->config_data = config;
1699
1700 hws[port_no] = hw; 1698 hws[port_no] = hw;
1701 idx[port_no] = hwif->index; 1699 idx[port_no] = hwif->index;
1702 } 1700 }
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 434dd02a4bdc..961f31c648c9 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -286,6 +286,7 @@ void ide_init_port_hw(ide_hwif_t *hwif, hw_regs_t *hw)
286 hwif->dev = hw->dev; 286 hwif->dev = hw->dev;
287 hwif->gendev.parent = hw->parent ? hw->parent : hw->dev; 287 hwif->gendev.parent = hw->parent ? hw->parent : hw->dev;
288 hwif->ack_intr = hw->ack_intr; 288 hwif->ack_intr = hw->ack_intr;
289 hwif->config_data = hw->config;
289} 290}
290 291
291/* 292/*