Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1386632

Re: [PATCH 1/2] mfd: twl6040: Disable and unprepare clk32k in twl6040_power() error path

Show all headers | View raw

On Wed, 20 Apr 2016, Javier Martinez Canillas wrote:

> 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: Javier Martinez Canillas <javier@osg.samsung.com>
> ---
> 
>  drivers/mfd/twl6040.c | 2 ++
>  1 file changed, 2 insertions(+)

Applied, thanks.

> diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c
> index 08a693cd38cc..4de92c16dfb8 100644
> --- a/drivers/mfd/twl6040.c
> +++ b/drivers/mfd/twl6040.c
> @@ -300,6 +300,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;
>  			}
> @@ -307,6 +308,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;
>  			}

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 1/2] mfd: twl6040: Disable and unprepare clk32k in twl6040_power() error path Javier Martinez Canillas <javier@osg.samsung.com> - 2016-04-20 17:20 +0200
  Re: [PATCH 1/2] mfd: twl6040: Disable and unprepare clk32k in  twl6040_power() error path Lee Jones <lee.jones@linaro.org> - 2016-04-25 18:20 +0200

csiph-web