Skip to contentSkip to conversation

ASoC: soc-dapm: Fix breakage with incorrect codec pointer

PATCH In review Dimitris Papastamos 3 participants 6 messages Jun 17, 2011 – Jun 19, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: soc-dapm: Fix breakage with incorrect codec pointer

---
 sound/soc/soc-dapm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/soc-dapm.c +1 -1
index 605c225..a877dc6 100644
@@ -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) {
Signature · 1 line
1.7.5.2
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · Dimitris Papastamos
---
 sound/soc/soc-dapm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/soc-dapm.c +0 -0
index 605c225..a877dc6 100644

sound/soc/soc-dapm.c static void dapm_seq_run_coalesced(struct snd_soc_dapm_context *dapm, · line 928

Quoted 8 lines
sound/soc/soc-dapm.c +1 -1
@@ -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) {
#2 lore raw
Quoted 6 lines · Liam Girdwood

sound/soc/soc-dapm.c static void dapm_seq_run_coalesced(struct snd_soc_dapm_context *dapm, · line 925

Quoted 2 lines · Dimitris Papastamos
sound/soc/soc-dapm.c +1 -1
-		soc_widget_update_bits(w, reg, mask, value);
+		snd_soc_update_bits(dapm->codec, reg, mask, value);

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.

#3 lore raw
Quoted 8 lines · Mark Brown
Quoted 6 lines · Liam Girdwood

sound/soc/soc-dapm.c static void dapm_seq_run_coalesced(struct snd_soc_dapm_context *dapm, · line 925

Quoted 2 lines · Dimitris Papastamos
sound/soc/soc-dapm.c +1 -1
-		soc_widget_update_bits(w, reg, mask, value);
+		snd_soc_update_bits(dapm->codec, reg, mask, value);
Quoted 4 lines

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

#4 lore raw
Quoted 2 lines · Dimitris Papastamos

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.

#5 lore raw
Quoted 9 lines · Mark Brown
Quoted 2 lines · Dimitris Papastamos

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.