Skip to contentSkip to conversation

ASoC: core: Fix snd_soc_add_card_controls to pass correct data

PATCH In review Stephen Warren 2 participants 2 messages Feb 14, 2012

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

PATCH 1/1 ASoC: core: Fix snd_soc_add_card_controls to pass correct data

Commit 022658b "ASoC: core: Add support for DAI and machine kcontrols." created new functions to create controls for cards, codecs, platforms, and DAIs. The new snd_soc_add_card_controls() passed the wrong "data" to utility function snd_soc_add_controls(); it should be passing a codec, but instead ended up passing the soc_card. Fix this.

---
 sound/soc/soc-core.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
sound/soc/soc-core.c +5 -1
index 8bd9995..e44b6f6 100644
@@ -2095,9 +2095,13 @@ int snd_soc_add_card_controls(struct snd_soc_card *soc_card,
 	const struct snd_kcontrol_new *controls, int num_controls)
 {
 	struct snd_card *card = soc_card->snd_card;
+	struct snd_soc_codec *codec =
+			list_first_entry(&soc_card->codec_dev_list,
+					 struct snd_soc_codec,
+					 card_list);
 
 	return snd_soc_add_controls(card, soc_card->dev, controls, num_controls,
-			NULL, soc_card);
+			NULL, codec);
 }
 EXPORT_SYMBOL_GPL(snd_soc_add_card_controls);
 
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 5 lines · Stephen Warren

Commit 022658b "ASoC: core: Add support for DAI and machine kcontrols." created new functions to create controls for cards, codecs, platforms, and DAIs. The new snd_soc_add_card_controls() passed the wrong "data" to utility function snd_soc_add_controls(); it should be passing a codec, but instead ended up passing the soc_card. Fix this.

Well, sort of. The idea with Liam's commit was to split things out so that card operations got given a card so the argument change was intentional. What's gone wrong is that things like PIN_SWITCH() (which is only ever used by cards) weren't updated to match so they still expect to find a CODEC there. This'll quite probably have broken some other machine specific controls too.

I'll send a patch for PIN_SWITCH later today but it looks like we need an audit of all the drivers using non-CODEC adds to make sure they don't assume a CODEC in the callbacks.