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 /drivers/ide/serverworks.c | |
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 'drivers/ide/serverworks.c')
-rw-r--r-- | drivers/ide/serverworks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c index 14718e73991e..b6554ef92716 100644 --- a/drivers/ide/serverworks.c +++ b/drivers/ide/serverworks.c | |||
@@ -175,7 +175,7 @@ static void svwks_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
175 | pci_write_config_byte(dev, 0x54, ultra_enable); | 175 | pci_write_config_byte(dev, 0x54, ultra_enable); |
176 | } | 176 | } |
177 | 177 | ||
178 | static unsigned int init_chipset_svwks(struct pci_dev *dev) | 178 | static int init_chipset_svwks(struct pci_dev *dev) |
179 | { | 179 | { |
180 | unsigned int reg; | 180 | unsigned int reg; |
181 | u8 btr; | 181 | u8 btr; |
@@ -270,7 +270,7 @@ static unsigned int init_chipset_svwks(struct pci_dev *dev) | |||
270 | pci_write_config_byte(dev, 0x5A, btr); | 270 | pci_write_config_byte(dev, 0x5A, btr); |
271 | } | 271 | } |
272 | 272 | ||
273 | return dev->irq; | 273 | return 0; |
274 | } | 274 | } |
275 | 275 | ||
276 | static u8 ata66_svwks_svwks(ide_hwif_t *hwif) | 276 | static u8 ata66_svwks_svwks(ide_hwif_t *hwif) |