diff mbox

ASoC: adi: Add missing return statement.

Message ID 1420042837-3337-1-git-send-email-andrew.jackson@arm.com (mailing list archive)
State Accepted
Commit ae6f636b8b2ea9d297a07fc7ef8ae54707d67b36
Headers show

Commit Message

Andrew Jackson Dec. 31, 2014, 4:20 p.m. UTC 
From: Andrew Jackson <Andrew.Jackson@arm.com>

The probe routine was disabling the clock even
if the system was configured successfully.  Add
a return statement to leave clocks enabled.

Signed-off-by: Andrew Jackson <Andrew.Jackson@arm.com>
---
Spotted while reviewing clock preparation

 sound/soc/adi/axi-i2s.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Comments

Lars-Peter Clausen Dec. 31, 2014, 4:34 p.m. UTC | #1 
On 12/31/2014 05:20 PM, Andrew Jackson wrote:
> From: Andrew Jackson <Andrew.Jackson@arm.com>
>
> The probe routine was disabling the clock even
> if the system was configured successfully.  Add
> a return statement to leave clocks enabled.
>
> Signed-off-by: Andrew Jackson <Andrew.Jackson@arm.com>

Acked-by: Lars-Peter Clausen <lars@metafoo.de>

Thanks, never noticed since the clock is shared with other peripherals.

> ---
> Spotted while reviewing clock preparation
>
>   sound/soc/adi/axi-i2s.c |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/sound/soc/adi/axi-i2s.c b/sound/soc/adi/axi-i2s.c
> index 7752860..4c23381 100644
> --- a/sound/soc/adi/axi-i2s.c
> +++ b/sound/soc/adi/axi-i2s.c
> @@ -240,6 +240,8 @@ static int axi_i2s_probe(struct platform_device *pdev)
>   	if (ret)
>   		goto err_clk_disable;
>
> +	return 0;
> +
>   err_clk_disable:
>   	clk_disable_unprepare(i2s->clk);
>   	return ret;
>
Mark Brown Jan. 5, 2015, 8:16 p.m. UTC | #2 
On Wed, Dec 31, 2014 at 04:20:37PM +0000, Andrew Jackson wrote:
> From: Andrew Jackson <Andrew.Jackson@arm.com>
> 
> The probe routine was disabling the clock even
> if the system was configured successfully.  Add
> a return statement to leave clocks enabled.

Applied, thanks.
diff mbox

Patch

diff --git a/sound/soc/adi/axi-i2s.c b/sound/soc/adi/axi-i2s.c
index 7752860..4c23381 100644
--- a/sound/soc/adi/axi-i2s.c
+++ b/sound/soc/adi/axi-i2s.c
@@ -240,6 +240,8 @@  static int axi_i2s_probe(struct platform_device *pdev)
 	if (ret)
 		goto err_clk_disable;
 
+	return 0;
+
 err_clk_disable:
 	clk_disable_unprepare(i2s->clk);
 	return ret;