From: Wei Yongjun Date: Thu, 18 Apr 2013 02:31:16 +0000 (+0800) Subject: rfkill: fix error return code in rfkill_gpio_probe() X-Git-Tag: v3.10-rc1~120^2~43^2^2~61^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06f95e66deca680ff73076914b6ee47bcbe94926;p=thirdparty%2Fkernel%2Flinux.git 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 [fix some indentation on the way] Signed-off-by: Johannes Berg --- diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index 78fc0937948df..fb076cd6f808a 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)