2009-11-28 15:48:26

by Thiago Farina

[permalink] [raw]
Subject: [PATCH] leds: fix the return value of ich7_lpc_probe.

In the function ich7_lpc_probe there is a 'return' that is not returning any
value, but it should because the return type is int not void.

Signed-off-by: Thiago Farina <[email protected]>
---
drivers/leds/leds-ss4200.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
index c7f6347..a0c4092 100644
--- a/drivers/leds/leds-ss4200.c
+++ b/drivers/leds/leds-ss4200.c
@@ -350,7 +350,7 @@ static int __devinit ich7_lpc_probe(struct pci_dev *dev,
status = pci_enable_device(dev);
if (status) {
dev_err(&dev->dev, "pci_enable_device failed\n");
- return;
+ return status;
}

nas_gpio_pci_dev = dev;
--
1.6.6.rc0.61.g41d5b


2009-11-28 19:54:23

by Dave Hansen

[permalink] [raw]
Subject: Re: [PATCH] leds: fix the return value of ich7_lpc_probe.

On Sat, 2009-11-28 at 10:48 -0500, Thiago Farina wrote:
> In the function ich7_lpc_probe there is a 'return' that is not returning any
> value, but it should because the return type is int not void.
>
> Signed-off-by: Thiago Farina <[email protected]>
> ---
> drivers/leds/leds-ss4200.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
> index c7f6347..a0c4092 100644
> --- a/drivers/leds/leds-ss4200.c
> +++ b/drivers/leds/leds-ss4200.c
> @@ -350,7 +350,7 @@ static int __devinit ich7_lpc_probe(struct pci_dev *dev,
> status = pci_enable_device(dev);
> if (status) {
> dev_err(&dev->dev, "pci_enable_device failed\n");
> - return;
> + return status;
> }

There's a patch in -mm to do something similar. It should be pushed
upstream when the next set of -mm patches goes.

http://userweb.kernel.org/~akpm/mmotm/broken-out/drivers-leds-leds-ss4200c-fix-return-statement.patch

Thanks for posting this, though.

-- Dave