aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/setup-pci.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/setup-pci.c')
-rw-r--r--drivers/ide/setup-pci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 30c0741c5e5c..4fa813b96e72 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -563,7 +563,8 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
563 if ((d->host_flags & IDE_HFLAG_NO_DMA) == 0) 563 if ((d->host_flags & IDE_HFLAG_NO_DMA) == 0)
564 ide_hwif_setup_dma(dev, d, hwif); 564 ide_hwif_setup_dma(dev, d, hwif);
565 565
566 if ((d->host_flags & IDE_HFLAG_LEGACY_IRQS) && hwif->irq == 0) 566 if ((!hwif->irq && (d->host_flags & IDE_HFLAG_LEGACY_IRQS)) ||
567 (d->host_flags & IDE_HFLAG_FORCE_LEGACY_IRQS))
567 hwif->irq = port ? 15 : 14; 568 hwif->irq = port ? 15 : 14;
568 569
569 hwif->host_flags = d->host_flags; 570 hwif->host_flags = d->host_flags;