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/pdc202xx_old.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/pdc202xx_old.c')
-rw-r--r-- | drivers/ide/pdc202xx_old.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c index 97193323aebf..cba66ebce4e3 100644 --- a/drivers/ide/pdc202xx_old.c +++ b/drivers/ide/pdc202xx_old.c | |||
@@ -264,7 +264,7 @@ static void pdc202xx_dma_timeout(ide_drive_t *drive) | |||
264 | ide_dma_timeout(drive); | 264 | ide_dma_timeout(drive); |
265 | } | 265 | } |
266 | 266 | ||
267 | static unsigned int init_chipset_pdc202xx(struct pci_dev *dev) | 267 | static int init_chipset_pdc202xx(struct pci_dev *dev) |
268 | { | 268 | { |
269 | unsigned long dmabase = pci_resource_start(dev, 4); | 269 | unsigned long dmabase = pci_resource_start(dev, 4); |
270 | u8 udma_speed_flag = 0, primary_mode = 0, secondary_mode = 0; | 270 | u8 udma_speed_flag = 0, primary_mode = 0, secondary_mode = 0; |
@@ -290,7 +290,7 @@ static unsigned int init_chipset_pdc202xx(struct pci_dev *dev) | |||
290 | printk("%sACTIVE\n", (inb(dmabase | 0x1f) & 1) ? "" : "IN"); | 290 | printk("%sACTIVE\n", (inb(dmabase | 0x1f) & 1) ? "" : "IN"); |
291 | } | 291 | } |
292 | out: | 292 | out: |
293 | return dev->irq; | 293 | return 0; |
294 | } | 294 | } |
295 | 295 | ||
296 | static void __devinit pdc202ata4_fixup_irq(struct pci_dev *dev, | 296 | static void __devinit pdc202ata4_fixup_irq(struct pci_dev *dev, |