summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/ac97.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-04 19:31:15 +0400
committerMark Brown <broonie@linaro.org>2014-08-04 19:31:15 +0400
commita1cb98ac8b6980fcd530271c739c3dd7436a91aa (patch)
tree02a084f7ccb9d80c60a99c15d66800154fed146e /sound/soc/codecs/ac97.c
parent7c0815289113167bee2da337afa6b34e3077e4f5 (diff)
parent0f2780ad4c2a398528c7bb1572158d6e894e5dd2 (diff)
downloadlinux-a1cb98ac8b6980fcd530271c739c3dd7436a91aa.tar.xz
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
Diffstat (limited to 'sound/soc/codecs/ac97.c')
-rw-r--r--sound/soc/codecs/ac97.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c
index 8d9ba4ba4bfe..e889e1b84192 100644
--- a/sound/soc/codecs/ac97.c
+++ b/sound/soc/codecs/ac97.c
@@ -89,8 +89,8 @@ static int ac97_soc_probe(struct snd_soc_codec *codec)
int ret;
/* add codec as bus device for standard ac97 */
- ret = snd_ac97_bus(codec->card->snd_card, 0, soc_ac97_ops, NULL,
- &ac97_bus);
+ ret = snd_ac97_bus(codec->component.card->snd_card, 0, soc_ac97_ops,
+ NULL, &ac97_bus);
if (ret < 0)
return ret;