sgiioc4: always init hwif->io_ports

'if (hwif->io_ports[IDE_DATA_OFFSET] != cmd_base)' is always true.

Cc: Jeremy Higdon <jeremy@sgi.com>
Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent b0d5bc27
...@@ -593,6 +593,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev) ...@@ -593,6 +593,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
ide_hwif_t *hwif; ide_hwif_t *hwif;
int h; int h;
u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
hw_regs_t hw;
/* /*
* Find an empty HWIF; if none available, return -ENOMEM. * Find an empty HWIF; if none available, return -ENOMEM.
...@@ -632,15 +633,11 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev) ...@@ -632,15 +633,11 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
return -ENOMEM; return -ENOMEM;
} }
if (hwif->io_ports[IDE_DATA_OFFSET] != cmd_base) { /* Initialize the IO registers */
hw_regs_t hw; memset(&hw, 0, sizeof(hw));
sgiioc4_init_hwif_ports(&hw, cmd_base, ctl, irqport);
/* Initialize the IO registers */ memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
memset(&hw, 0, sizeof(hw)); hwif->noprobe = 0;
sgiioc4_init_hwif_ports(&hw, cmd_base, ctl, irqport);
memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
}
hwif->irq = dev->irq; hwif->irq = dev->irq;
hwif->chipset = ide_pci; hwif->chipset = ide_pci;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment