diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-06 12:48:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-06 12:48:51 +0100 |
| commit | 5bcaca4b5bf2b05cc15a2c5bfb3d95fc49607e36 (patch) | |
| tree | 1272753ff995b96c610c922f1963fb454f900311 /sound/soc/soc-dapm.c | |
| parent | 832a94143c549bc750350c4e770f1f604e6aaffb (diff) | |
| parent | b2d9de549c30170eed5691d369cf16680e0ce03a (diff) | |
| download | linux-5bcaca4b5bf2b05cc15a2c5bfb3d95fc49607e36.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 177bd8639ef9..79f3b1eaf3b1 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3109,7 +3109,8 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, } w->dapm = dapm; - w->codec = dapm->codec; + if (dapm->component) + w->codec = dapm->component->codec; INIT_LIST_HEAD(&w->sources); INIT_LIST_HEAD(&w->sinks); INIT_LIST_HEAD(&w->list); |