alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Arvind Yadav <arvind.yadav.cs@gmail.com>
To: perex@perex.cz, tiwai@suse.com, broonie@kernel.org,
	krzk@kernel.org, sbkim73@samsung.com, lgirdwood@gmail.com
Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: [PATCH 07/11] ASoC: jz4740: Handle return value of clk_prepare_enable.
Date: Tue, 25 Jul 2017 15:44:34 +0530	[thread overview]
Message-ID: <1500977674-27960-8-git-send-email-arvind.yadav.cs@gmail.com> (raw)
In-Reply-To: <1500977674-27960-1-git-send-email-arvind.yadav.cs@gmail.com>

clk_prepare_enable() can fail here and we must check its return value.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
 sound/soc/jz4740/jz4740-i2s.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
index 794a349..99394c0 100644
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -133,6 +133,7 @@ static int jz4740_i2s_startup(struct snd_pcm_substream *substream,
 {
 	struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai);
 	uint32_t conf, ctrl;
+	int ret;
 
 	if (dai->active)
 		return 0;
@@ -141,7 +142,9 @@ static int jz4740_i2s_startup(struct snd_pcm_substream *substream,
 	ctrl |= JZ_AIC_CTRL_FLUSH;
 	jz4740_i2s_write(i2s, JZ_REG_AIC_CTRL, ctrl);
 
-	clk_prepare_enable(i2s->clk_i2s);
+	ret = clk_prepare_enable(i2s->clk_i2s);
+	if (ret)
+		return ret;
 
 	conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF);
 	conf |= JZ_AIC_CONF_ENABLE;
@@ -352,11 +355,18 @@ static int jz4740_i2s_resume(struct snd_soc_dai *dai)
 {
 	struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai);
 	uint32_t conf;
+	int ret;
 
-	clk_prepare_enable(i2s->clk_aic);
+	ret = clk_prepare_enable(i2s->clk_aic);
+	if (ret)
+		return ret;
 
 	if (dai->active) {
-		clk_prepare_enable(i2s->clk_i2s);
+		ret = clk_prepare_enable(i2s->clk_i2s);
+		if (ret) {
+			clk_disable_unprepare(i2s->clk_aic);
+			return ret;
+		}
 
 		conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF);
 		conf |= JZ_AIC_CONF_ENABLE;
@@ -387,8 +397,11 @@ static int jz4740_i2s_dai_probe(struct snd_soc_dai *dai)
 {
 	struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai);
 	uint32_t conf;
+	int ret;
 
-	clk_prepare_enable(i2s->clk_aic);
+	ret = clk_prepare_enable(i2s->clk_aic);
+	if (ret)
+		return ret;
 
 	jz4740_i2c_init_pcm_config(i2s);
 	snd_soc_dai_init_dma_data(dai, &i2s->playback_dma_data,
-- 
1.9.1

  parent reply	other threads:[~2017-07-25 10:14 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-25 10:14 [PATCH 00/11] Handle return value of clk_prepare_enable Arvind Yadav
2017-07-25 10:14 ` [PATCH 01/11] ASoC: samsung: s3c2412: " Arvind Yadav
2017-07-25 17:43   ` Krzysztof Kozlowski
2017-07-26 14:17   ` Applied "ASoC: samsung: s3c2412: Handle return value of clk_prepare_enable." to the asoc tree Mark Brown
2017-07-26 15:46     ` Krzysztof Kozlowski
2017-07-26 16:07       ` Mark Brown
2017-07-26 16:13         ` Krzysztof Kozlowski
2017-07-25 10:14 ` [PATCH 02/11] ASoC: samsung: s3c24xx: Handle return value of clk_prepare_enable Arvind Yadav
2017-07-25 17:50   ` Krzysztof Kozlowski
2017-07-26 14:17   ` Applied "ASoC: samsung: s3c24xx: Handle return value of clk_prepare_enable." to the asoc tree Mark Brown
2017-07-25 10:14 ` [PATCH 03/11] ASoC: samsung: pcm: Handle return value of clk_prepare_enable Arvind Yadav
2017-07-25 17:51   ` Krzysztof Kozlowski
2017-07-26 14:17   ` Applied "ASoC: samsung: pcm: Handle return value of clk_prepare_enable." to the asoc tree Mark Brown
2017-07-25 10:14 ` [PATCH 04/11] ASoC: samsung: i2s: Handle return value of clk_prepare_enable Arvind Yadav
2017-07-25 17:58   ` Krzysztof Kozlowski
2017-07-26 14:17   ` Applied "ASoC: samsung: i2s: Handle return value of clk_prepare_enable." to the asoc tree Mark Brown
2017-07-25 10:14 ` [PATCH 05/11] ASoC: samsung: spdif: Handle return value of clk_prepare_enable Arvind Yadav
2017-07-25 18:01   ` Krzysztof Kozlowski
2017-07-26 14:17   ` Applied "ASoC: samsung: spdif: Handle return value of clk_prepare_enable." to the asoc tree Mark Brown
2017-07-25 10:14 ` [PATCH 06/11] ASoC: mxs-saif: Handle return value of clk_prepare_enable/clk_prepare Arvind Yadav
2017-07-26 14:16   ` Applied "ASoC: mxs-saif: Handle return value of clk_prepare_enable/clk_prepare." to the asoc tree Mark Brown
2017-07-25 10:14 ` Arvind Yadav [this message]
2017-07-26 14:16   ` Applied "ASoC: jz4740: Handle return value of clk_prepare_enable." " Mark Brown

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=1500977674-27960-8-git-send-email-arvind.yadav.cs@gmail.com \
    --to=arvind.yadav.cs@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=krzk@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=sbkim73@samsung.com \
    --cc=tiwai@suse.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;
as well as URLs for NNTP newsgroup(s).