diff mbox

ASoC: fsl: fsl_spdif: Check for clk_prepare_enable() error

Message ID 1434835086-27176-1-git-send-email-festevam@gmail.com (mailing list archive)
State Accepted
Commit fa3be9208dcb21ae4185f6122137fe7d5cf29d74
Headers show

Commit Message

Fabio Estevam June 20, 2015, 9:18 p.m. UTC 
From: Fabio Estevam <fabio.estevam@freescale.com>

clk_prepare_enable() may fail, so we should better check its return value
and propagate it in the case of error.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 sound/soc/fsl/fsl_spdif.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Comments

Nicolin Chen June 21, 2015, 1:55 a.m. UTC | #1 
On Sat, Jun 20, 2015 at 06:18:06PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> clk_prepare_enable() may fail, so we should better check its return value
> and propagate it in the case of error.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>

Thank you
Nicolin

> ---
>  sound/soc/fsl/fsl_spdif.c | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
> index 8e93221..489fa86 100644
> --- a/sound/soc/fsl/fsl_spdif.c
> +++ b/sound/soc/fsl/fsl_spdif.c
> @@ -482,13 +482,18 @@ static int fsl_spdif_startup(struct snd_pcm_substream *substream,
>  		mask = SCR_TXFIFO_AUTOSYNC_MASK | SCR_TXFIFO_CTRL_MASK |
>  			SCR_TXSEL_MASK | SCR_USRC_SEL_MASK |
>  			SCR_TXFIFO_FSEL_MASK;
> -		for (i = 0; i < SPDIF_TXRATE_MAX; i++)
> -			clk_prepare_enable(spdif_priv->txclk[i]);
> +		for (i = 0; i < SPDIF_TXRATE_MAX; i++) {
> +			ret = clk_prepare_enable(spdif_priv->txclk[i]);
> +			if (ret)
> +				goto disable_txclk;
> +		}
>  	} else {
>  		scr = SCR_RXFIFO_FSEL_IF8 | SCR_RXFIFO_AUTOSYNC;
>  		mask = SCR_RXFIFO_FSEL_MASK | SCR_RXFIFO_AUTOSYNC_MASK|
>  			SCR_RXFIFO_CTL_MASK | SCR_RXFIFO_OFF_MASK;
> -		clk_prepare_enable(spdif_priv->rxclk);
> +		ret = clk_prepare_enable(spdif_priv->rxclk);
> +		if (ret)
> +			goto err;
>  	}
>  	regmap_update_bits(regmap, REG_SPDIF_SCR, mask, scr);
>  
> @@ -497,6 +502,9 @@ static int fsl_spdif_startup(struct snd_pcm_substream *substream,
>  
>  	return 0;
>  
> +disable_txclk:
> +	for (i--; i >= 0; i--)
> +		clk_disable_unprepare(spdif_priv->txclk[i]);
>  err:
>  	clk_disable_unprepare(spdif_priv->coreclk);
>  
> -- 
> 1.9.1
>
diff mbox

Patch

diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index 8e93221..489fa86 100644
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -482,13 +482,18 @@  static int fsl_spdif_startup(struct snd_pcm_substream *substream,
 		mask = SCR_TXFIFO_AUTOSYNC_MASK | SCR_TXFIFO_CTRL_MASK |
 			SCR_TXSEL_MASK | SCR_USRC_SEL_MASK |
 			SCR_TXFIFO_FSEL_MASK;
-		for (i = 0; i < SPDIF_TXRATE_MAX; i++)
-			clk_prepare_enable(spdif_priv->txclk[i]);
+		for (i = 0; i < SPDIF_TXRATE_MAX; i++) {
+			ret = clk_prepare_enable(spdif_priv->txclk[i]);
+			if (ret)
+				goto disable_txclk;
+		}
 	} else {
 		scr = SCR_RXFIFO_FSEL_IF8 | SCR_RXFIFO_AUTOSYNC;
 		mask = SCR_RXFIFO_FSEL_MASK | SCR_RXFIFO_AUTOSYNC_MASK|
 			SCR_RXFIFO_CTL_MASK | SCR_RXFIFO_OFF_MASK;
-		clk_prepare_enable(spdif_priv->rxclk);
+		ret = clk_prepare_enable(spdif_priv->rxclk);
+		if (ret)
+			goto err;
 	}
 	regmap_update_bits(regmap, REG_SPDIF_SCR, mask, scr);
 
@@ -497,6 +502,9 @@  static int fsl_spdif_startup(struct snd_pcm_substream *substream,
 
 	return 0;
 
+disable_txclk:
+	for (i--; i >= 0; i--)
+		clk_disable_unprepare(spdif_priv->txclk[i]);
 err:
 	clk_disable_unprepare(spdif_priv->coreclk);