diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-24 18:22:53 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-24 18:22:53 -0400 |
commit | 2ed0ef543ae3f3ea4f8bd0433fb1fed22625a309 (patch) | |
tree | 44777820dcef08ed0fc4b9583bf982220ba15154 /include/linux/ide.h | |
parent | a182807a89946bd531122bb2da60fa9ceee90343 (diff) |
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 { | |||
851 | ide_hwif_t *ports[MAX_HOST_PORTS + 1]; | 851 | ide_hwif_t *ports[MAX_HOST_PORTS + 1]; |
852 | unsigned int n_ports; | 852 | unsigned int n_ports; |
853 | struct device *dev[2]; | 853 | struct device *dev[2]; |
854 | unsigned int (*init_chipset)(struct pci_dev *); | 854 | int (*init_chipset)(struct pci_dev *); |
855 | irq_handler_t irq_handler; | 855 | irq_handler_t irq_handler; |
856 | unsigned long host_flags; | 856 | unsigned long host_flags; |
857 | void *host_priv; | 857 | void *host_priv; |
@@ -1361,7 +1361,7 @@ enum { | |||
1361 | 1361 | ||
1362 | struct ide_port_info { | 1362 | struct ide_port_info { |
1363 | char *name; | 1363 | char *name; |
1364 | unsigned int (*init_chipset)(struct pci_dev *); | 1364 | int (*init_chipset)(struct pci_dev *); |
1365 | void (*init_iops)(ide_hwif_t *); | 1365 | void (*init_iops)(ide_hwif_t *); |
1366 | void (*init_hwif)(ide_hwif_t *); | 1366 | void (*init_hwif)(ide_hwif_t *); |
1367 | int (*init_dma)(ide_hwif_t *, | 1367 | int (*init_dma)(ide_hwif_t *, |