public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Lee Jones <lee.jones@linaro.org>
To: Javier Martinez Canillas <javier@osg.samsung.com>
Cc: linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
	Tony Lindgren <tony@atomide.com>
Subject: Re: [PATCH 2/2] mfd: twl6040: Check clk_prepare_enable() return value in twl6040_power()
Date: Mon, 25 Apr 2016 17:18:48 +0100	[thread overview]
Message-ID: <20160425161848.GL2713@dell> (raw)
In-Reply-To: <1461165398-12289-2-git-send-email-javier@osg.samsung.com>

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

> The clk_prepare_enable() function can fail so check the return
> value and propagate the error in case of a failure.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> 
> ---
> 
>  drivers/mfd/twl6040.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)

Applied, thanks.

> diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c
> index 4de92c16dfb8..852d5874aabb 100644
> --- a/drivers/mfd/twl6040.c
> +++ b/drivers/mfd/twl6040.c
> @@ -291,7 +291,11 @@ int twl6040_power(struct twl6040 *twl6040, int on)
>  		if (twl6040->power_count++)
>  			goto out;
>  
> -		clk_prepare_enable(twl6040->clk32k);
> +		ret = clk_prepare_enable(twl6040->clk32k);
> +		if (ret) {
> +			twl6040->power_count = 0;
> +			goto out;
> +		}
>  
>  		/* Allow writes to the chip */
>  		regcache_cache_only(twl6040->regmap, false);

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

  reply	other threads:[~2016-04-25 16:18 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-20 15:16 [PATCH 1/2] mfd: twl6040: Disable and unprepare clk32k in twl6040_power() error path Javier Martinez Canillas
2016-04-20 15:16 ` [PATCH 2/2] mfd: twl6040: Check clk_prepare_enable() return value in twl6040_power() Javier Martinez Canillas
2016-04-25 16:18   ` Lee Jones [this message]
2016-04-25 16:18 ` [PATCH 1/2] mfd: twl6040: Disable and unprepare clk32k in twl6040_power() error path Lee Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160425161848.GL2713@dell \
    --to=lee.jones@linaro.org \
    --cc=javier@osg.samsung.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox