From: Javier Martinez Canillas <javier@osg.samsung.com>
To: linux-kernel@vger.kernel.org
Cc: Javier Martinez Canillas <javier@osg.samsung.com>,
linux-omap@vger.kernel.org, Tony Lindgren <tony@atomide.com>,
Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 2/2] mfd: twl6040: Check clk_prepare_enable() return value in twl6040_power()
Date: Wed, 20 Apr 2016 11:16:38 -0400 [thread overview]
Message-ID: <1461165398-12289-2-git-send-email-javier@osg.samsung.com> (raw)
In-Reply-To: <1461165398-12289-1-git-send-email-javier@osg.samsung.com>
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(-)
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);
--
2.5.5
next prev parent reply other threads:[~2016-04-20 15:17 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 ` Javier Martinez Canillas [this message]
2016-04-25 16:18 ` [PATCH 2/2] mfd: twl6040: Check clk_prepare_enable() return value in twl6040_power() Lee Jones
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=1461165398-12289-2-git-send-email-javier@osg.samsung.com \
--to=javier@osg.samsung.com \
--cc=lee.jones@linaro.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.