2013-04-18 02:31:18

by Wei Yongjun

Subject: [PATCH] net: rfkill: fix error return code in rfkill_gpio_probe()

From: Wei Yongjun <[email protected]>

Fix to return a negative error code from the error handling
case instead of 0, as returned elsewhere in this function.

Signed-off-by: Wei Yongjun <[email protected]>
---
net/rfkill/rfkill-gpio.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 78fc093..6d75e73 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -131,6 +131,7 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
rfkill->pwr_clk = clk_get(&pdev->dev, pdata->power_clk_name);
if (IS_ERR(rfkill->pwr_clk)) {
pr_warn("%s: can't find pwr_clk.\n", __func__);
+ ret = PTR_ERR(rfkill->pwr_clk);
goto fail_shutdown_name;
}
}
@@ -153,8 +154,10 @@ static int rfkill_gpio_probe(struct platform_device *pdev)

rfkill->rfkill_dev = rfkill_alloc(pdata->name, &pdev->dev, pdata->type,
&rfkill_gpio_ops, rfkill);
- if (!rfkill->rfkill_dev)
+ if (!rfkill->rfkill_dev) {
+ ret = -ENOMEM;
goto fail_shutdown;
+ }

ret = rfkill_register(rfkill->rfkill_dev);
if (ret < 0)

2013-04-22 13:45:10

by Johannes Berg

Subject: Re: [PATCH] net: rfkill: fix error return code in rfkill_gpio_probe()

On Thu, 2013-04-18 at 10:31 +0800, Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> Fix to return a negative error code from the error handling
> case instead of 0, as returned elsewhere in this function.

Applied (to mac80211-next, I don't want to maintain a separate tree for
the two rfkill I get a year)

johannes