Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...

[karo-tx-linux.git] / drivers / power / pda_power.c

diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index 7312f2651647fbb97e64caa56fe03e778f2508a0..7df7c5facc10fee68e4d9a89b0f1e549ea16b3f7 100644 (file)
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -281,6 +281,12 @@ static int pda_power_probe(struct platform_device *pdev)
                        goto init_failed;
        }
 
+       ac_draw = regulator_get(dev, "ac_draw");
+       if (IS_ERR(ac_draw)) {
+               dev_dbg(dev, "couldn't get ac_draw regulator\n");
+               ac_draw = NULL;
+       }
+
        update_status();
        update_charger();
 
@@ -309,13 +315,6 @@ static int pda_power_probe(struct platform_device *pdev)
                pda_psy_usb.num_supplicants = pdata->num_supplicants;
        }
 
-       ac_draw = regulator_get(dev, "ac_draw");
-       if (IS_ERR(ac_draw)) {
-               dev_dbg(dev, "couldn't get ac_draw regulator\n");
-               ac_draw = NULL;
-               ret = PTR_ERR(ac_draw);
-       }
-
 #ifdef CONFIG_USB_OTG_UTILS
        transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
        if (!IS_ERR_OR_NULL(transceiver)) {