pda_power: Fix ac_draw usage before it being set

When I reboot my iPAQ hx4700 in its cradle, the battery will not begin
to charge even though the AC supply is connected. Charging will start
only after the PDA power driver is tickled by some other power event,
such as reseating the iPAQ in its cradle or connecting the USB cable.

The problem lies in pda_power_probe(), where ac_draw is used by the call
to update_charger() before being set by the call to regulator_get().

Moving the regulator_get() call to before the update_charger() call
fixes the problem.

Signed-off-by: Paul Parsons <lost.distance@yahoo.com>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>

diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index 7312f2651647fbb97e64caa56fe03e778f2508a0..75536ebdb132ae2a978b61ede1b7436ecc1dde17 100644 (file)
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -281,6 +281,14 @@ 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;
+               ret = PTR_ERR(ac_draw);
+               goto ac_draw_failed;
+       }
+
        update_status();
        update_charger();
 
@@ -309,13 +317,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)) {
@@ -415,6 +416,7 @@ ac_supply_failed:
                regulator_put(ac_draw);
                ac_draw = NULL;
        }
+ac_draw_failed:
        if (pdata->exit)
                pdata->exit(dev);
 init_failed: