Skip to content

Commit

Permalink
pda_power: Remove ac_draw_failed goto and label
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Parsons authored and Anton Vorontsov committed Sep 21, 2012
1 parent 3950c78 commit c10a002
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions drivers/power/pda_power.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -416,7 +414,6 @@ 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 c10a002

Please sign in to comment.