summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-09-29 11:40:42 +0200
committerMark Brown <broonie@kernel.org>2014-09-29 19:25:52 +0200
commit0bd2ac3dae74ee25c5ea171cb572731c7a89c248 (patch)
tree8bbf4da4840acba3c1c19ad1ffd926624673eeb8 /sound/soc/soc-dapm.c
parentASoC: rx51: Use snd_soc_dapm_to_codec() instead of dapm->codec (diff)
downloadlinux-0bd2ac3dae74ee25c5ea171cb572731c7a89c248.tar.xz
linux-0bd2ac3dae74ee25c5ea171cb572731c7a89c248.zip
ASoC: Remove CODEC pointer from snd_soc_dapm_context
The only remaining user of the CODEC pointer in the DAPM struct is to initialize the CODEC pointer in the widget struct. The later is scheduled for removal, but has still a few users left. For now use dapm->component->codec to initialize it. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 8348352dc2c6..1f1e9657481a 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3107,7 +3107,7 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
}
w->dapm = dapm;
- w->codec = dapm->codec;
+ w->codec = dapm->component->codec;
INIT_LIST_HEAD(&w->sources);
INIT_LIST_HEAD(&w->sinks);
INIT_LIST_HEAD(&w->list);