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/sl82c105.c | |
| parent | a182807a89946bd531122bb2da60fa9ceee90343 (diff) | |
| download | op-kernel-dev-2ed0ef543ae3f3ea4f8bd0433fb1fed22625a309.zip op-kernel-dev-2ed0ef543ae3f3ea4f8bd0433fb1fed22625a309.tar.gz | |
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/sl82c105.c')
| -rw-r--r-- | drivers/ide/sl82c105.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c index 6297956..dba213c 100644 --- a/drivers/ide/sl82c105.c +++ b/drivers/ide/sl82c105.c @@ -271,7 +271,7 @@ static u8 sl82c105_bridge_revision(struct pci_dev *dev) * channel 0 here at least, but channel 1 has to be enabled by * firmware or arch code. We still set both to 16 bits mode. */ -static unsigned int init_chipset_sl82c105(struct pci_dev *dev) +static int init_chipset_sl82c105(struct pci_dev *dev) { u32 val; @@ -281,7 +281,7 @@ static unsigned int init_chipset_sl82c105(struct pci_dev *dev) val |= CTRL_P0EN | CTRL_P0F16 | CTRL_P1F16; pci_write_config_dword(dev, 0x40, val); - return dev->irq; + return 0; } static const struct ide_port_ops sl82c105_port_ops = { |
