Merge remote-tracking branch 'asoc/topic/component' into asoc-next

[deliverable/linux.git] / sound / soc / codecs / wm_adsp.c

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 2537725dd53ff43563122dd8b2566c1ef08af5e8..f412a9911a75d2fe531930f6a0108fb977c41e77 100644 (file)
--- 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: