2010-11-24 07:15:44

by Axel Lin

Subject: [PATCH 1/2] ASoC: Return proper error for omap3pandora_soc_init

Return PTR_ERR(omap3pandora_dac_reg) instead of 0 if regulator_get failed.

Signed-off-by: Axel Lin <[email protected]>
---
sound/soc/omap/omap3pandora.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index bff9864..8047c52 100644
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -307,6 +307,7 @@ static int __init omap3pandora_soc_init(void)
pr_err(PREFIX "Failed to get DAC regulator from %s: %ld\n",
dev_name(&omap3pandora_snd_device->dev),
PTR_ERR(omap3pandora_dac_reg));
+ ret = PTR_ERR(omap3pandora_dac_reg);
goto fail3;
}

--
1.7.2

2010-11-24 07:18:14

by Axel Lin

Subject: [PATCH 2/2] ASoC: Fix resource reclaim for osk5912

Signed-off-by: Axel Lin <[email protected]>
---
sound/soc/omap/osk5912.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c
index 18d053d..7e75e77 100644
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/omap/osk5912.c
@@ -177,7 +177,8 @@ static int __init osk_soc_init(void)
tlv320aic23_mclk = clk_get(dev, "mclk");
if (IS_ERR(tlv320aic23_mclk)) {
printk(KERN_ERR "Could not get mclk clock\n");
- return -ENODEV;
+ err = PTR_ERR(tlv320aic23_mclk);
+ goto err2;
}

/*
@@ -188,7 +189,7 @@ static int __init osk_soc_init(void)
if (clk_set_rate(tlv320aic23_mclk, CODEC_CLOCK)) {
printk(KERN_ERR "Cannot set MCLK for AIC23 CODEC\n");
err = -ECANCELED;
- goto err1;
+ goto err3;
}
}

@@ -196,9 +197,12 @@ static int __init osk_soc_init(void)
(uint) clk_get_rate(tlv320aic23_mclk), CODEC_CLOCK);

return 0;
-err1:
+
+err3:
clk_put(tlv320aic23_mclk);
+err2:
platform_device_del(osk_snd_device);
+err1:
platform_device_put(osk_snd_device);

return err;
@@ -207,6 +211,7 @@ err1:

static void __exit osk_soc_exit(void)
{
+ clk_put(tlv320aic23_mclk);
platform_device_unregister(osk_snd_device);
}

--
1.7.2

2010-11-24 08:33:27

by Jarkko Nikula

Subject: Re: [PATCH 1/2] ASoC: Return proper error for omap3pandora_soc_init

On Wed, 24 Nov 2010 15:20:48 +0800
Axel Lin <[email protected]> wrote:

> Return PTR_ERR(omap3pandora_dac_reg) instead of 0 if regulator_get failed.
>
> Signed-off-by: Axel Lin <[email protected]>
> ---
> sound/soc/omap/omap3pandora.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
> index bff9864..8047c52 100644
> --- a/sound/soc/omap/omap3pandora.c
> +++ b/sound/soc/omap/omap3pandora.c
> @@ -307,6 +307,7 @@ static int __init omap3pandora_soc_init(void)
> pr_err(PREFIX "Failed to get DAC regulator from %s: %ld\n",
> dev_name(&omap3pandora_snd_device->dev),
> PTR_ERR(omap3pandora_dac_reg));
> + ret = PTR_ERR(omap3pandora_dac_reg);
> goto fail3;
> }

Acked-by: Jarkko Nikula <[email protected]>

2010-11-24 08:33:32

by Jarkko Nikula

Subject: Re: [PATCH 2/2] ASoC: Fix resource reclaim for osk5912

On Wed, 24 Nov 2010 15:23:20 +0800
Axel Lin <[email protected]> wrote:

> Signed-off-by: Axel Lin <[email protected]>
> ---
> sound/soc/omap/osk5912.c | 11 ++++++++---
> 1 files changed, 8 insertions(+), 3 deletions(-)
>
Good catches,

Acked-by: Jarkko Nikula <[email protected]>

2010-11-24 08:37:49

by Varadarajan, Charulatha

Subject: Re: [PATCH 2/2] ASoC: Fix resource reclaim for osk5912

On Wed, Nov 24, 2010 at 12:53, Axel Lin <[email protected]> wrote:

Add Patch description.

> Signed-off-by: Axel Lin <[email protected]>
> ---
> ?sound/soc/omap/osk5912.c | ? 11 ++++++++---
> ?1 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c
> index 18d053d..7e75e77 100644
> --- a/sound/soc/omap/osk5912.c
> +++ b/sound/soc/omap/osk5912.c

<<snip>>

2010-11-24 10:49:16

by Liam Girdwood

Subject: Re: [PATCH 1/2] ASoC: Return proper error for omap3pandora_soc_init

On Wed, 2010-11-24 at 15:20 +0800, Axel Lin wrote:
> Return PTR_ERR(omap3pandora_dac_reg) instead of 0 if regulator_get failed.
>
> Signed-off-by: Axel Lin <[email protected]>
> ---
> sound/soc/omap/omap3pandora.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
> index bff9864..8047c52 100644
> --- a/sound/soc/omap/omap3pandora.c
> +++ b/sound/soc/omap/omap3pandora.c
> @@ -307,6 +307,7 @@ static int __init omap3pandora_soc_init(void)
> pr_err(PREFIX "Failed to get DAC regulator from %s: %ld\n",
> dev_name(&omap3pandora_snd_device->dev),
> PTR_ERR(omap3pandora_dac_reg));
> + ret = PTR_ERR(omap3pandora_dac_reg);
> goto fail3;
> }
>

Acked-by: Liam Girdwood <[email protected]>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

2010-11-24 10:51:06

by Liam Girdwood

Subject: Re: [PATCH 2/2] ASoC: Fix resource reclaim for osk5912

On Wed, 2010-11-24 at 14:07 +0530, Varadarajan, Charulatha wrote:
> On Wed, Nov 24, 2010 at 12:53, Axel Lin <[email protected]> wrote:
>
> Add Patch description.
>
> > Signed-off-by: Axel Lin <[email protected]>
> > ---

Please resubmit with a patch description and Jarkko's Ack.

Thanks

Liam
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

2010-11-24 11:30:55

by Mark Brown

Subject: Re: [PATCH 1/2] ASoC: Return proper error for omap3pandora_soc_init

On Wed, Nov 24, 2010 at 03:20:48PM +0800, Axel Lin wrote:
> Return PTR_ERR(omap3pandora_dac_reg) instead of 0 if regulator_get failed.
>
> Signed-off-by: Axel Lin <[email protected]>

Applied, thanks.