diff options
Diffstat (limited to 'drivers/power/pda_power.c')
-rw-r--r-- | drivers/power/pda_power.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c index 7312f2651647..75536ebdb132 100644 --- 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) | |||
281 | goto init_failed; | 281 | goto init_failed; |
282 | } | 282 | } |
283 | 283 | ||
284 | ac_draw = regulator_get(dev, "ac_draw"); | ||
285 | if (IS_ERR(ac_draw)) { | ||
286 | dev_dbg(dev, "couldn't get ac_draw regulator\n"); | ||
287 | ac_draw = NULL; | ||
288 | ret = PTR_ERR(ac_draw); | ||
289 | goto ac_draw_failed; | ||
290 | } | ||
291 | |||
284 | update_status(); | 292 | update_status(); |
285 | update_charger(); | 293 | update_charger(); |
286 | 294 | ||
@@ -309,13 +317,6 @@ static int pda_power_probe(struct platform_device *pdev) | |||
309 | pda_psy_usb.num_supplicants = pdata->num_supplicants; | 317 | pda_psy_usb.num_supplicants = pdata->num_supplicants; |
310 | } | 318 | } |
311 | 319 | ||
312 | ac_draw = regulator_get(dev, "ac_draw"); | ||
313 | if (IS_ERR(ac_draw)) { | ||
314 | dev_dbg(dev, "couldn't get ac_draw regulator\n"); | ||
315 | ac_draw = NULL; | ||
316 | ret = PTR_ERR(ac_draw); | ||
317 | } | ||
318 | |||
319 | #ifdef CONFIG_USB_OTG_UTILS | 320 | #ifdef CONFIG_USB_OTG_UTILS |
320 | transceiver = usb_get_phy(USB_PHY_TYPE_USB2); | 321 | transceiver = usb_get_phy(USB_PHY_TYPE_USB2); |
321 | if (!IS_ERR_OR_NULL(transceiver)) { | 322 | if (!IS_ERR_OR_NULL(transceiver)) { |
@@ -415,6 +416,7 @@ ac_supply_failed: | |||
415 | regulator_put(ac_draw); | 416 | regulator_put(ac_draw); |
416 | ac_draw = NULL; | 417 | ac_draw = NULL; |
417 | } | 418 | } |
419 | ac_draw_failed: | ||
418 | if (pdata->exit) | 420 | if (pdata->exit) |
419 | pdata->exit(dev); | 421 | pdata->exit(dev); |
420 | init_failed: | 422 | init_failed: |