[PATCH] ASoC: soc-dapm: Fix breakage with incorrect codec pointer

[PATCH] ASoC: soc-dapm: Fix breakage with incorrect codec pointer

[Dimitris Papastamos]

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
---
 sound/soc/soc-dapm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 605c225..a877dc6 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -922,7 +922,7 @@ static void dapm_seq_run_coalesced(struct snd_soc_dapm_context *dapm,
 			"pop test : Applying 0x%x/0x%x to %x in %dms\n",
 			value, mask, reg, card->pop_time);
 		pop_wait(card->pop_time);
-		soc_widget_update_bits(w, reg, mask, value);
+		snd_soc_update_bits(dapm->codec, reg, mask, value);
 	}
 
 	list_for_each_entry(w, pending, power_list) {
-- 
1.7.5.2

Re: [PATCH] ASoC: soc-dapm: Fix breakage with incorrect codec pointer

[Liam Girdwood]

On 17/06/11 15:52, Dimitris Papastamos wrote:
> Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
> ---
>  sound/soc/soc-dapm.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
> index 605c225..a877dc6 100644
> --- a/sound/soc/soc-dapm.c
> +++ b/sound/soc/soc-dapm.c
> @@ -922,7 +922,7 @@ static void dapm_seq_run_coalesced(struct snd_soc_dapm_context *dapm,
>  			"pop test : Applying 0x%x/0x%x to %x in %dms\n",
>  			value, mask, reg, card->pop_time);
>  		pop_wait(card->pop_time);
> -		soc_widget_update_bits(w, reg, mask, value);
> +		snd_soc_update_bits(dapm->codec, reg, mask, value);
>  	}
>  
>  	list_for_each_entry(w, pending, power_list) {

Acked-by: Liam Girdwood <lrg@ti.com>

Re: [PATCH] ASoC: soc-dapm: Fix breakage with incorrect codec pointer

[Mark Brown]

On Fri, Jun 17, 2011 at 04:50:02PM +0100, Liam Girdwood wrote:
> On 17/06/11 15:52, Dimitris Papastamos wrote:

> > -		soc_widget_update_bits(w, reg, mask, value);
> > +		snd_soc_update_bits(dapm->codec, reg, mask, value);

> Acked-by: Liam Girdwood <lrg@ti.com>

This'll work just now but it essentially invalidates the change to
support non-CODEC DAPM widgets - we need to fix that change properly,
this means that anything other than a CODEC won't be able to use
registers.

Re: [PATCH] ASoC: soc-dapm: Fix breakage with incorrect codec pointer

[Dimitris Papastamos]

On Fri, Jun 17, 2011 at 05:01:53PM +0100, Mark Brown wrote:
> On Fri, Jun 17, 2011 at 04:50:02PM +0100, Liam Girdwood wrote:
> > On 17/06/11 15:52, Dimitris Papastamos wrote:
> 
> > > -		soc_widget_update_bits(w, reg, mask, value);
> > > +		snd_soc_update_bits(dapm->codec, reg, mask, value);
> 
> > Acked-by: Liam Girdwood <lrg@ti.com>
> 
> This'll work just now but it essentially invalidates the change to
> support non-CODEC DAPM widgets - we need to fix that change properly,
> this means that anything other than a CODEC won't be able to use
> registers.

Yes that's true.  That was a quick fix to temporarily take care of this
problem.

Thanks,
Dimitris

Re: [PATCH] ASoC: soc-dapm: Fix breakage with incorrect codec pointer

[Mark Brown]

On Sat, Jun 18, 2011 at 03:10:46PM +0100, Dimitris Papastamos wrote:

> Yes that's true.  That was a quick fix to temporarily take care of this
> problem.

With something like this I think it's probably as well to just revert
the original commit until we've got things sorted out, having the
feature sort of implemented but totally unusuble is probably worse than
not having it at all.

Re: [PATCH] ASoC: soc-dapm: Fix breakage with incorrect codec pointer

[Dimitris Papastamos]

On Sat, Jun 18, 2011 at 03:41:02PM +0100, Mark Brown wrote:
> On Sat, Jun 18, 2011 at 03:10:46PM +0100, Dimitris Papastamos wrote:
> 
> > Yes that's true.  That was a quick fix to temporarily take care of this
> > problem.
> 
> With something like this I think it's probably as well to just revert
> the original commit until we've got things sorted out, having the
> feature sort of implemented but totally unusuble is probably worse than
> not having it at all.

Yea indeed.