[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <505BBB4B.3060508@yahoo.com>
Date: Fri, 21 Sep 2012 01:56:43 +0100
From: Paul Parsons <lost.distance@...oo.com>
To: cbou@...l.ru, dwmw2@...radead.org
CC: philipp.zabel@...il.com, linux-kernel@...r.kernel.org
Subject: [PATCH] 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@...oo.com>
Cc: Philipp Zabel <philipp.zabel@...il.com>
---
drivers/power/pda_power.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index d3be834d..7df7c5f 100644
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -284,9 +284,7 @@ static int pda_power_probe(struct platform_device *pdev)
ac_draw = regulator_get(dev, "ac_draw");
if (IS_ERR(ac_draw)) {
dev_dbg(dev, "couldn't get ac_draw regulator\n");
- ret = PTR_ERR(ac_draw);
ac_draw = NULL;
- 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:
--
1.7.8.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists