Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Paul Parsons and committed by
Anton Vorontsov
c10a002a 3950c786

-3
-3
drivers/power/pda_power.c
··· 285 285 if (IS_ERR(ac_draw)) { 286 286 dev_dbg(dev, "couldn't get ac_draw regulator\n"); 287 287 ac_draw = NULL; 288 - ret = PTR_ERR(ac_draw); 289 - goto ac_draw_failed; 290 288 } 291 289 292 290 update_status(); ··· 414 416 regulator_put(ac_draw); 415 417 ac_draw = NULL; 416 418 } 417 - ac_draw_failed: 418 419 if (pdata->exit) 419 420 pdata->exit(dev); 420 421 init_failed: