V4L/DVB (10987): cx23885: fix crash on non-netup cards

[linux-2.6-omap-h63xx.git] / drivers / ide / hpt366.c

diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
index 3eb9b5c63a0f4a3a4c67facb6e7687a465f69936..d3b3e824f445e53bae0270152b6bb185d5fb889e 100644 (file)
--- a/drivers/ide/hpt366.c
+++ b/drivers/ide/hpt366.c
@@ -995,7 +995,7 @@ static void hpt3xx_disable_fast_irq(struct pci_dev *dev, u8 mcr_addr)
                pci_write_config_byte(dev, mcr_addr + 1, new_mcr);
 }
 
-static unsigned int init_chipset_hpt366(struct pci_dev *dev)
+static int init_chipset_hpt366(struct pci_dev *dev)
 {
        unsigned long io_base   = pci_resource_start(dev, 4);
        struct hpt_info *info   = hpt3xx_get_info(&dev->dev);
@@ -1237,7 +1237,7 @@ static unsigned int init_chipset_hpt366(struct pci_dev *dev)
        hpt3xx_disable_fast_irq(dev, 0x50);
        hpt3xx_disable_fast_irq(dev, 0x54);
 
-       return dev->irq;
+       return 0;
 }
 
 static u8 hpt3xx_cable_detect(ide_hwif_t *hwif)