ide-cd: use common completion path for DMA requests in cdrom_newpc_intr()

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

diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c
index 4485b9c6f0e68bc8c5b28f26652d133f54b7b1df..878f8ec6dbe1147b182fdedca240b86041f37710 100644 (file)
--- a/drivers/ide/aec62xx.c
+++ b/drivers/ide/aec62xx.c
@@ -139,7 +139,7 @@ static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio)
        drive->hwif->port_ops->set_dma_mode(drive, pio + XFER_PIO_0);
 }
 
-static unsigned int init_chipset_aec62xx(struct pci_dev *dev)
+static int init_chipset_aec62xx(struct pci_dev *dev)
 {
        /* These are necessary to get AEC6280 Macintosh cards to work */
        if ((dev->device == PCI_DEVICE_ID_ARTOP_ATP865) ||
@@ -156,7 +156,7 @@ static unsigned int init_chipset_aec62xx(struct pci_dev *dev)
                pci_write_config_byte(dev, 0x4a, reg4ah | 0x80);
        }
 
-       return dev->irq;
+       return 0;
 }
 
 static u8 atp86x_cable_detect(ide_hwif_t *hwif)