diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-04 16:31:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-04 16:31:15 +0100 |
| commit | a1cb98ac8b6980fcd530271c739c3dd7436a91aa (patch) | |
| tree | 02a084f7ccb9d80c60a99c15d66800154fed146e /sound/soc/codecs/wm_adsp.c | |
| parent | 7c0815289113167bee2da337afa6b34e3077e4f5 (diff) | |
| parent | 0f2780ad4c2a398528c7bb1572158d6e894e5dd2 (diff) | |
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm_adsp.c')
| -rw-r--r-- | sound/soc/codecs/wm_adsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 2537725dd53..f412a9911a7 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1382,7 +1382,7 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w, int ret; int val; - dsp->card = codec->card; + dsp->card = codec->component.card; switch (event) { case SND_SOC_DAPM_POST_PMU: @@ -1617,7 +1617,7 @@ int wm_adsp2_early_event(struct snd_soc_dapm_widget *w, struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec); struct wm_adsp *dsp = &dsps[w->shift]; - dsp->card = codec->card; + dsp->card = codec->component.card; switch (event) { case SND_SOC_DAPM_PRE_PMU: |