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/ac97.c | |
parent | Merge remote-tracking branch 'asoc/fix/tlv320aic31xx' into asoc-linus (diff) | |
parent | ASoC: Add function to register component controls (diff) | |
download | wireguard-linux-a1cb98ac8b6980fcd530271c739c3dd7436a91aa.tar.xz wireguard-linux-a1cb98ac8b6980fcd530271c739c3dd7436a91aa.zip |
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.c | 4 |
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; |