Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

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)