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/uda134x.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/uda134x.c')
-rw-r--r-- | sound/soc/codecs/uda134x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c index edf27acc1d77..12fc0aed7503 100644 --- a/sound/soc/codecs/uda134x.c +++ b/sound/soc/codecs/uda134x.c @@ -479,7 +479,7 @@ static struct snd_soc_dai_driver uda134x_dai = { static int uda134x_soc_probe(struct snd_soc_codec *codec) { struct uda134x_priv *uda134x; - struct uda134x_platform_data *pd = codec->card->dev->platform_data; + struct uda134x_platform_data *pd = codec->component.card->dev->platform_data; const struct snd_soc_dapm_widget *widgets; unsigned num_widgets; |