diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-24 23:22:53 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-24 23:22:53 +0100 |
| commit | 2ed0ef543ae3f3ea4f8bd0433fb1fed22625a309 (patch) | |
| tree | 44777820dcef08ed0fc4b9583bf982220ba15154 /drivers/ide/pdc202xx_new.c | |
| parent | a182807a89946bd531122bb2da60fa9ceee90343 (diff) | |
| download | kernel_samsung_smdk4412-2ed0ef543ae3f3ea4f8bd0433fb1fed22625a309.zip kernel_samsung_smdk4412-2ed0ef543ae3f3ea4f8bd0433fb1fed22625a309.tar.gz kernel_samsung_smdk4412-2ed0ef543ae3f3ea4f8bd0433fb1fed22625a309.tar.bz2 | |
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_new.c')
| -rw-r--r-- | drivers/ide/pdc202xx_new.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/pdc202xx_new.c b/drivers/ide/pdc202xx_new.c index f21290c..b68906c 100644 --- a/drivers/ide/pdc202xx_new.c +++ b/drivers/ide/pdc202xx_new.c @@ -325,7 +325,7 @@ static void apple_kiwi_init(struct pci_dev *pdev) } #endif /* CONFIG_PPC_PMAC */ -static unsigned int init_chipset_pdcnew(struct pci_dev *dev) +static int init_chipset_pdcnew(struct pci_dev *dev) { const char *name = DRV_NAME; unsigned long dma_base = pci_resource_start(dev, 4); @@ -444,7 +444,7 @@ static unsigned int init_chipset_pdcnew(struct pci_dev *dev) #endif out: - return dev->irq; + return 0; } static struct pci_dev * __devinit pdc20270_get_dev2(struct pci_dev *dev) |