Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6441dc5 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Lee Jones
Browse files

mfd: twl6040: Disable and unprepare clk32k in twl6040_power() error path 



The clk32k clock is prepared and enabled in twl6040_power() but the clock
is left enabled in case of an error while it should be disable/unprepared.

Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 32852bca

drivers/mfd/twl6040.c

+2 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ int twl6040_power(struct twl6040 *twl6040, int on) 
			/* use automatic power-up sequence */

			ret = twl6040_power_up_automatic(twl6040);

			if (ret) {

				clk_disable_unprepare(twl6040->clk32k);

				twl6040->power_count = 0;

				goto out;

			}
@@ -311,6 +312,7 @@ int twl6040_power(struct twl6040 *twl6040, int on) 
			/* use manual power-up sequence */

			ret = twl6040_power_up_manual(twl6040);

			if (ret) {

				clk_disable_unprepare(twl6040->clk32k);

				twl6040->power_count = 0;

				goto out;

			}