2014-12-31 16:21:23

by Andrew Jackson

Subject: [PATCH] ASoC: adi: Add missing return statement.

From: Andrew Jackson <[email protected]>

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 <[email protected]>
---
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;
--
1.7.1

2014-12-31 16:34:49

by Lars-Peter Clausen

Subject: Re: [PATCH] ASoC: adi: Add missing return statement.

On 12/31/2014 05:20 PM, Andrew Jackson wrote:
> From: Andrew Jackson <[email protected]>
>
> 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 <[email protected]>

Acked-by: Lars-Peter Clausen <[email protected]>

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;
>