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/sl82c105.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/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 6297956507c0..dba213c51baa 100644 --- a/drivers/ide/sl82c105.c +++ b/drivers/ide/sl82c105.c | |||
@@ -271,7 +271,7 @@ static u8 sl82c105_bridge_revision(struct pci_dev *dev) | |||
271 | * channel 0 here at least, but channel 1 has to be enabled by | 271 | * channel 0 here at least, but channel 1 has to be enabled by |
272 | * firmware or arch code. We still set both to 16 bits mode. | 272 | * firmware or arch code. We still set both to 16 bits mode. |
273 | */ | 273 | */ |
274 | static unsigned int init_chipset_sl82c105(struct pci_dev *dev) | 274 | static int init_chipset_sl82c105(struct pci_dev *dev) |
275 | { | 275 | { |
276 | u32 val; | 276 | u32 val; |
277 | 277 | ||
@@ -281,7 +281,7 @@ static unsigned int init_chipset_sl82c105(struct pci_dev *dev) | |||
281 | val |= CTRL_P0EN | CTRL_P0F16 | CTRL_P1F16; | 281 | val |= CTRL_P0EN | CTRL_P0F16 | CTRL_P1F16; |
282 | pci_write_config_dword(dev, 0x40, val); | 282 | pci_write_config_dword(dev, 0x40, val); |
283 | 283 | ||
284 | return dev->irq; | 284 | return 0; |
285 | } | 285 | } |
286 | 286 | ||
287 | static const struct ide_port_ops sl82c105_port_ops = { | 287 | static const struct ide_port_ops sl82c105_port_ops = { |