Skip to content

Commit

Permalink
pda_power: Fix ac_draw usage before it being set
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Parsons authored and Anton Vorontsov committed Sep 20, 2012
1 parent 2815b78 commit ec60ea5
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions drivers/power/pda_power.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -415,6 +416,7 @@ static int pda_power_probe(struct platform_device *pdev)
regulator_put(ac_draw);
ac_draw = NULL;
}
ac_draw_failed:
if (pdata->exit)
pdata->exit(dev);
init_failed:
Expand Down

0 comments on commit ec60ea5

Please sign in to comment.