diff options
Diffstat (limited to 'drivers/ide/ide-probe.c')
| -rw-r--r-- | drivers/ide/ide-probe.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 727a67109ff0..f17ba1932ad6 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
| @@ -1048,8 +1048,7 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port, | |||
| 1048 | { | 1048 | { |
| 1049 | hwif->channel = port; | 1049 | hwif->channel = port; |
| 1050 | 1050 | ||
| 1051 | if (d->chipset) | 1051 | hwif->chipset = d->chipset ? d->chipset : ide_pci; |
| 1052 | hwif->chipset = d->chipset; | ||
| 1053 | 1052 | ||
| 1054 | if (d->init_iops) | 1053 | if (d->init_iops) |
| 1055 | d->init_iops(hwif); | 1054 | d->init_iops(hwif); |
| @@ -1178,7 +1177,6 @@ static void ide_init_port_hw(ide_hwif_t *hwif, hw_regs_t *hw) | |||
| 1178 | { | 1177 | { |
| 1179 | memcpy(&hwif->io_ports, &hw->io_ports, sizeof(hwif->io_ports)); | 1178 | memcpy(&hwif->io_ports, &hw->io_ports, sizeof(hwif->io_ports)); |
| 1180 | hwif->irq = hw->irq; | 1179 | hwif->irq = hw->irq; |
| 1181 | hwif->chipset = hw->chipset; | ||
| 1182 | hwif->dev = hw->dev; | 1180 | hwif->dev = hw->dev; |
| 1183 | hwif->gendev.parent = hw->parent ? hw->parent : hw->dev; | 1181 | hwif->gendev.parent = hw->parent ? hw->parent : hw->dev; |
| 1184 | hwif->ack_intr = hw->ack_intr; | 1182 | hwif->ack_intr = hw->ack_intr; |