mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 22:51:42 +00:00
pda_power: Remove ac_draw_failed goto and label
A previous patch added the ac_draw_failed goto and label to pda_power_probe(). The goto would be invoked after a failed call to regulator_get(). However the way ac_draw is used - always after a check for NULL - suggests that a failed call to regulator_get() was not fatal. This patch removes the ac_draw_failed goto and label, partly reverting the previous patch. This patch also removes the assignment of an error code to ret after a failed call to regulator_get(), since the error code is now never used. Signed-off-by: Paul Parsons <lost.distance@yahoo.com> Cc: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
This commit is contained in:
parent
3950c7865c
commit
c10a002a2b
@ -285,8 +285,6 @@ static int pda_power_probe(struct platform_device *pdev)
|
||||
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();
|
||||
@ -416,7 +414,6 @@ ac_supply_failed:
|
||||
regulator_put(ac_draw);
|
||||
ac_draw = NULL;
|
||||
}
|
||||
ac_draw_failed:
|
||||
if (pdata->exit)
|
||||
pdata->exit(dev);
|
||||
init_failed:
|
||||
|
Loading…
Reference in New Issue
Block a user