diff --git a/[refs] b/[refs] index 3a00bcc4074d..110da5368fab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3950c7865cd7c963982a2c94457182b96732f4c9 +refs/heads/master: c10a002a2b4af557730e71591c529fbdf355433f diff --git a/trunk/drivers/power/pda_power.c b/trunk/drivers/power/pda_power.c index 75536ebdb132..7df7c5facc10 100644 --- a/trunk/drivers/power/pda_power.c +++ b/trunk/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 @@ 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: