diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-18 10:31:16 +0800 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-22 15:42:18 +0200 |
| commit | 06f95e66deca680ff73076914b6ee47bcbe94926 (patch) | |
| tree | 73d6bec7dbe68bf8459e36764b8a0944d2959740 /net/rfkill | |
| parent | 8ceb59557bdc373e532b87d4142ce27e04218f0e (diff) | |
| download | linux-06f95e66deca680ff73076914b6ee47bcbe94926.tar.gz linux-06f95e66deca680ff73076914b6ee47bcbe94926.tar.bz2 linux-06f95e66deca680ff73076914b6ee47bcbe94926.zip | |
rfkill: fix error return code in rfkill_gpio_probe()
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 <yongjun_wei@trendmicro.com.cn>
[fix some indentation on the way]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/rfkill')
| -rw-r--r-- | net/rfkill/rfkill-gpio.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index 78fc0937948d..fb076cd6f808 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; } } @@ -152,9 +153,11 @@ 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) + &rfkill_gpio_ops, rfkill); + if (!rfkill->rfkill_dev) { + ret = -ENOMEM; goto fail_shutdown; + } ret = rfkill_register(rfkill->rfkill_dev); if (ret < 0) |