Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330490
b: refs/heads/master
c: ec60ea5
h: refs/heads/master
v: v3
  • Loading branch information
Paul Parsons authored and Anton Vorontsov committed Sep 20, 2012
1 parent 98bd1ff commit 391c129
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2815b786c3bb86fff97f1f6e2f0874903ff2339b
refs/heads/master: ec60ea5cd6c9f4b249de1580b8ebfa430055008c
16 changes: 9 additions & 7 deletions trunk/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 391c129

Please sign in to comment.