Skip to content

Commit

Permalink
regulator: Report error codes for bulk operations
Browse files Browse the repository at this point in the history
If we're going to log an error we may as well log what the error
code that we're failing on is.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  • Loading branch information
Mark Brown authored and Liam Girdwood committed Dec 17, 2009
1 parent be0e2d3 commit 5b30762
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions 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 5b30762

Please sign in to comment.