From c10a002a2b4af557730e71591c529fbdf355433f Mon Sep 17 00:00:00 2001 From: Paul Parsons Date: Fri, 21 Sep 2012 16:49:45 -0700 Subject: 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 Cc: Philipp Zabel Signed-off-by: Anton Vorontsov --- drivers/power/pda_power.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'drivers/power') diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c index 75536ebdb132..7df7c5facc10 100644 --- a/drivers/power/pda_power.c +++ b/drivers/power/pda_power.c @@ -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: -- cgit v1.2.3