Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364823
b: refs/heads/master
c: 88b1c78
h: refs/heads/master
i:
  364821: 6c5ebfd
  364819: 12194eb
  364815: 27a46ee
v: v3
  • Loading branch information
Fabio Baltieri authored and Felipe Balbi committed Apr 3, 2013
1 parent 8b6c478 commit ce21c13
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 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: ecfd3f7bb3d5dceb8e7ad1c117303c774cb90234
refs/heads/master: 88b1c78db32782041d9548e3c4ab405f9e9eab59
12 changes: 9 additions & 3 deletions trunk/drivers/usb/phy/phy-ab8500-usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,9 @@ static void ab8500_usb_regulator_enable(struct ab8500_usb *ab)
{
int ret, volt;

regulator_enable(ab->v_ape);
ret = regulator_enable(ab->v_ape);
if (ret)
dev_err(ab->dev, "Failed to enable v-ape\n");

if (!is_ab8500_2p0_or_earlier(ab->ab8500)) {
ab->saved_v_ulpi = regulator_get_voltage(ab->v_ulpi);
Expand All @@ -185,7 +187,9 @@ static void ab8500_usb_regulator_enable(struct ab8500_usb *ab)
ret);
}

regulator_enable(ab->v_ulpi);
ret = regulator_enable(ab->v_ulpi);
if (ret)
dev_err(ab->dev, "Failed to enable vddulpivio18\n");

if (!is_ab8500_2p0_or_earlier(ab->ab8500)) {
volt = regulator_get_voltage(ab->v_ulpi);
Expand All @@ -194,7 +198,9 @@ static void ab8500_usb_regulator_enable(struct ab8500_usb *ab)
volt);
}

regulator_enable(ab->v_musb);
ret = regulator_enable(ab->v_musb);
if (ret)
dev_err(ab->dev, "Failed to enable musb_1v8\n");
}

static void ab8500_usb_regulator_disable(struct ab8500_usb *ab)
Expand Down

0 comments on commit ce21c13

Please sign in to comment.