Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

[firefly-linux-kernel-4.4.55.git] / net / rfkill / rfkill-gpio.c

diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 78fc0937948df7b8bc2b865cd28d98a17506cc10..fb076cd6f808ad9b409a9670bffa699a7435de34 100644 (file)
--- 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)