diff options
| author | Bartlomiej Zolnierkiewicz | 2009-03-24 23:22:53 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2009-03-24 23:22:53 +0100 |
| commit | 2ed0ef543ae3f3ea4f8bd0433fb1fed22625a309 (patch) | |
| tree | 44777820dcef08ed0fc4b9583bf982220ba15154 /include/linux/ide.h | |
| parent | ide: remove try_to_identify() wrapper (diff) | |
| download | kernel-qcow2-linux-2ed0ef543ae3f3ea4f8bd0433fb1fed22625a309.tar.gz kernel-qcow2-linux-2ed0ef543ae3f3ea4f8bd0433fb1fed22625a309.tar.xz kernel-qcow2-linux-2ed0ef543ae3f3ea4f8bd0433fb1fed22625a309.zip | |
ide: fix ->init_chipset method to return 'int' value
* Return 0 instead of dev->irq in ->init_chipset implementations.
* Fix ->init_chipset method to return 'int' value instead of
'unsigned int' one.
This fixes ->init_chipset handling for host drivers (cs5530, hpt366
and pdc202xx_new) for which it is possible for this method to fail.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux/ide.h')
| -rw-r--r-- | include/linux/ide.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 31e492c7bdef..117dd171e70b 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -851,7 +851,7 @@ struct ide_host { ide_hwif_t *ports[MAX_HOST_PORTS + 1]; unsigned int n_ports; struct device *dev[2]; - unsigned int (*init_chipset)(struct pci_dev *); + int (*init_chipset)(struct pci_dev *); irq_handler_t irq_handler; unsigned long host_flags; void *host_priv; @@ -1361,7 +1361,7 @@ enum { struct ide_port_info { char *name; - unsigned int (*init_chipset)(struct pci_dev *); + int (*init_chipset)(struct pci_dev *); void (*init_iops)(ide_hwif_t *); void (*init_hwif)(ide_hwif_t *); int (*init_dma)(ide_hwif_t *, |