Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 177715
b: refs/heads/master
c: 5b30762
h: refs/heads/master
i:
  177713: 068c88f
  177711: c0cc931
v: v3
  • Loading branch information
Mark Brown authored and Liam Girdwood committed Dec 17, 2009
1 parent 30ba8b1 commit 64c8d98
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 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: be0e2d3e802908e2a3ca620ba8f49ecab87982b2
refs/heads/master: 5b307627738f1f6cbc31fad9e28a299b5fe55602
9 changes: 5 additions & 4 deletions trunk/drivers/regulator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1885,9 +1885,9 @@ int regulator_bulk_get(struct device *dev, int num_consumers,
consumers[i].consumer = regulator_get(dev,
consumers[i].supply);
if (IS_ERR(consumers[i].consumer)) {
dev_err(dev, "Failed to get supply '%s'\n",
consumers[i].supply);
ret = PTR_ERR(consumers[i].consumer);
dev_err(dev, "Failed to get supply '%s': %d\n",
consumers[i].supply, ret);
consumers[i].consumer = NULL;
goto err;
}
Expand Down Expand Up @@ -1930,7 +1930,7 @@ int regulator_bulk_enable(int num_consumers,
return 0;

err:
printk(KERN_ERR "Failed to enable %s\n", consumers[i].supply);
printk(KERN_ERR "Failed to enable %s: %d\n", consumers[i].supply, ret);
for (i = 0; i < num_consumers; i++)
regulator_disable(consumers[i].consumer);

Expand Down Expand Up @@ -1965,7 +1965,8 @@ int regulator_bulk_disable(int num_consumers,
return 0;

err:
printk(KERN_ERR "Failed to disable %s\n", consumers[i].supply);
printk(KERN_ERR "Failed to disable %s: %d\n", consumers[i].supply,
ret);
for (i = 0; i < num_consumers; i++)
regulator_enable(consumers[i].consumer);

Expand Down

0 comments on commit 64c8d98

Please sign in to comment.