summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-08-19 15:51:23 +0200
committerMark Brown <broonie@linaro.org>2014-08-19 10:59:46 -0500
commit57bf772687700e206c760ba2e4097f78bde97887 (patch)
treee561664b7ac4e362ae8dac17ec33c57aeec86594 /sound/soc/soc-core.c
parent65d9361f0cb50a20641802ee3075145d72e4409c (diff)
ASoC: Pass component instead of DAPM context to AUX dev init callback
Given that the component is the containing structure it makes more sense to pass the component rather than the DAPM context to the AUX dev init callback. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 08c04f4c7e6..4393bc33d3a 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1632,7 +1632,7 @@ static int soc_probe_aux_dev(struct snd_soc_card *card, int num)
/* do machine specific initialization */
if (aux_dev->init) {
- ret = aux_dev->init(snd_soc_component_get_dapm(rtd->component));
+ ret = aux_dev->init(rtd->component);
if (ret < 0) {
dev_err(card->dev, "ASoC: failed to init %s: %d\n",
aux_dev->name, ret);