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/tegra/trimslice.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/tegra/trimslice.c')
| -rw-r--r-- | sound/soc/tegra/trimslice.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/tegra/trimslice.c b/sound/soc/tegra/trimslice.c index 734bfcd21148..589d2d9b553a 100644 --- a/sound/soc/tegra/trimslice.c +++ b/sound/soc/tegra/trimslice.c @@ -50,8 +50,7 @@ static int trimslice_asoc_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *codec_dai = rtd->codec_dai; - struct snd_soc_codec *codec = codec_dai->codec; - struct snd_soc_card *card = codec->card; + struct snd_soc_card *card = rtd->card; struct tegra_trimslice *trimslice = snd_soc_card_get_drvdata(card); int srate, mclk; int err; |