diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-02 01:09:31 +0300 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-02 01:09:31 +0300 |
| commit | 425afb61032a245f53320b7efa0f0dfd7a23f87f (patch) | |
| tree | a529125e82489111a286ada3c456cfffcd6acbe3 | |
| parent | 2be564b03483e57dc0efbd91d91393665caa5aa4 (diff) | |
| download | linux-425afb61032a245f53320b7efa0f0dfd7a23f87f.tar.xz | |
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>
| -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) * remove all the ifdef PCI crap */ #ifdef CONFIG_BLK_DEV_IDEPCI - if (hwif->pci_dev && !hwif->pci_dev->vendor) + if (hwif->chipset != ide_pci) #endif /* CONFIG_BLK_DEV_IDEPCI */ { /* |