* [PATCH 2/2] ASoC: Fix resource reclaim for osk5912
2010-11-24 7:20 [PATCH 1/2] ASoC: Return proper error for omap3pandora_soc_init Axel Lin
@ 2010-11-24 7:23 ` Axel Lin
2010-11-24 8:33 ` Jarkko Nikula
2010-11-24 8:37 ` Varadarajan, Charulatha
2010-11-24 8:33 ` [PATCH 1/2] ASoC: Return proper error for omap3pandora_soc_init Jarkko Nikula
` (2 subsequent siblings)
3 siblings, 2 replies; 8+ messages in thread
From: Axel Lin @ 2010-11-24 7:23 UTC (permalink / raw)
To: linux-kernel
Cc: Arun KS, Jarkko Nikula, Liam Girdwood, Mark Brown, linux-omap
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 2/2] ASoC: Fix resource reclaim for osk5912
2010-11-24 7:23 ` [PATCH 2/2] ASoC: Fix resource reclaim for osk5912 Axel Lin
@ 2010-11-24 8:33 ` Jarkko Nikula
2010-11-24 8:37 ` Varadarajan, Charulatha
1 sibling, 0 replies; 8+ messages in thread
From: Jarkko Nikula @ 2010-11-24 8:33 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Arun KS, Liam Girdwood, Mark Brown, linux-omap
On Wed, 24 Nov 2010 15:23:20 +0800
Axel Lin <axel.lin@gmail.com> wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> sound/soc/omap/osk5912.c | 11 ++++++++---
> 1 files changed, 8 insertions(+), 3 deletions(-)
>
Good catches,
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] ASoC: Fix resource reclaim for osk5912
2010-11-24 7:23 ` [PATCH 2/2] ASoC: Fix resource reclaim for osk5912 Axel Lin
2010-11-24 8:33 ` Jarkko Nikula
@ 2010-11-24 8:37 ` Varadarajan, Charulatha
2010-11-24 10:50 ` Liam Girdwood
1 sibling, 1 reply; 8+ messages in thread
From: Varadarajan, Charulatha @ 2010-11-24 8:37 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Arun KS, Jarkko Nikula, Liam Girdwood, Mark Brown,
linux-omap
On Wed, Nov 24, 2010 at 12:53, Axel Lin <axel.lin@gmail.com> wrote:
Add Patch description.
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> 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>>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] ASoC: Fix resource reclaim for osk5912
2010-11-24 8:37 ` Varadarajan, Charulatha
@ 2010-11-24 10:50 ` Liam Girdwood
0 siblings, 0 replies; 8+ messages in thread
From: Liam Girdwood @ 2010-11-24 10:50 UTC (permalink / raw)
To: Varadarajan, Charulatha, axel lin
Cc: Axel Lin, linux-kernel, Arun KS, Jarkko Nikula, Mark Brown,
linux-omap
On Wed, 2010-11-24 at 14:07 +0530, Varadarajan, Charulatha wrote:
> On Wed, Nov 24, 2010 at 12:53, Axel Lin <axel.lin@gmail.com> wrote:
>
> Add Patch description.
>
> > Signed-off-by: Axel Lin <axel.lin@gmail.com>
> > ---
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] ASoC: Return proper error for omap3pandora_soc_init
2010-11-24 7:20 [PATCH 1/2] ASoC: Return proper error for omap3pandora_soc_init Axel Lin
2010-11-24 7:23 ` [PATCH 2/2] ASoC: Fix resource reclaim for osk5912 Axel Lin
@ 2010-11-24 8:33 ` Jarkko Nikula
2010-11-24 10:49 ` Liam Girdwood
2010-11-24 11:30 ` Mark Brown
3 siblings, 0 replies; 8+ messages in thread
From: Jarkko Nikula @ 2010-11-24 8:33 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Grazvydas Ignotas, Liam Girdwood, Mark Brown,
linux-omap
On Wed, 24 Nov 2010 15:20:48 +0800
Axel Lin <axel.lin@gmail.com> wrote:
> Return PTR_ERR(omap3pandora_dac_reg) instead of 0 if regulator_get failed.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> 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 <jhnikula@gmail.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] ASoC: Return proper error for omap3pandora_soc_init
2010-11-24 7:20 [PATCH 1/2] ASoC: Return proper error for omap3pandora_soc_init Axel Lin
2010-11-24 7:23 ` [PATCH 2/2] ASoC: Fix resource reclaim for osk5912 Axel Lin
2010-11-24 8:33 ` [PATCH 1/2] ASoC: Return proper error for omap3pandora_soc_init Jarkko Nikula
@ 2010-11-24 10:49 ` Liam Girdwood
2010-11-24 11:30 ` Mark Brown
3 siblings, 0 replies; 8+ messages in thread
From: Liam Girdwood @ 2010-11-24 10:49 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Grazvydas Ignotas, Jarkko Nikula, Mark Brown,
linux-omap
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 <axel.lin@gmail.com>
> ---
> 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 <lrg@slimlogic.co.uk>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] ASoC: Return proper error for omap3pandora_soc_init
2010-11-24 7:20 [PATCH 1/2] ASoC: Return proper error for omap3pandora_soc_init Axel Lin
` (2 preceding siblings ...)
2010-11-24 10:49 ` Liam Girdwood
@ 2010-11-24 11:30 ` Mark Brown
3 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2010-11-24 11:30 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Grazvydas Ignotas, Jarkko Nikula, Liam Girdwood,
linux-omap
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 <axel.lin@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 8+ messages in thread