diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:31 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:31 -0500 |
commit | 425afb61032a245f53320b7efa0f0dfd7a23f87f (patch) | |
tree | a529125e82489111a286ada3c456cfffcd6acbe3 /drivers | |
parent | 2be564b03483e57dc0efbd91d91393665caa5aa4 (diff) |
ide: fix ide_intr() for non-PCI devices and CONFIG_BLK_DEV_IDEPCI=y
'hwif->pci_dev && !hwif->pci_dev->vendor' condition is never true,
check for 'hwif->chipset != ide_pci' instead.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ide/ide-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index e6bb9cf24e3d..4bddef0c0b96 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -1487,7 +1487,7 @@ irqreturn_t ide_intr (int irq, void *dev_id) | |||
1487 | * remove all the ifdef PCI crap | 1487 | * remove all the ifdef PCI crap |
1488 | */ | 1488 | */ |
1489 | #ifdef CONFIG_BLK_DEV_IDEPCI | 1489 | #ifdef CONFIG_BLK_DEV_IDEPCI |
1490 | if (hwif->pci_dev && !hwif->pci_dev->vendor) | 1490 | if (hwif->chipset != ide_pci) |
1491 | #endif /* CONFIG_BLK_DEV_IDEPCI */ | 1491 | #endif /* CONFIG_BLK_DEV_IDEPCI */ |
1492 | { | 1492 | { |
1493 | /* | 1493 | /* |