diff options
| author | Tom Cherry <tcherry@nvidia.com> | 2012-05-30 18:18:17 -0700 |
|---|---|---|
| committer | Tom Cherry <tcherry@nvidia.com> | 2012-05-30 18:18:17 -0700 |
| commit | 7af2c7ce772882f6e85e2a357711bf822f066bfa (patch) | |
| tree | 2a1307a8096a62d4252a7c382f43204da3325401 /sound/soc/tegra/tegra_wm8753.c | |
| parent | d92da78335899834f8f667eb7c865aaf47bdff48 (diff) | |
| parent | c9d3eda2af45736e73f0dfd2261257e083f3758a (diff) | |
Merge commit 'main-ics-2012.05.30-A1' into dev-jb-staging
Diffstat (limited to 'sound/soc/tegra/tegra_wm8753.c')
| -rw-r--r-- | sound/soc/tegra/tegra_wm8753.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra_wm8753.c b/sound/soc/tegra/tegra_wm8753.c index 795356875ba4..f7c7a4c6b5a1 100644 --- a/sound/soc/tegra/tegra_wm8753.c +++ b/sound/soc/tegra/tegra_wm8753.c @@ -379,7 +379,6 @@ static int tegra_bt_call_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_codec *codec = rtd->codec; struct snd_soc_card *card = codec->card; struct tegra_wm8753 *machine = snd_soc_card_get_drvdata(card); @@ -783,6 +782,10 @@ static int tegra_wm8753_init(struct snd_soc_pcm_runtime *rtd) if (ret < 0) return ret; + ret = tegra_asoc_utils_register_ctls(&machine->util_data); + if (ret < 0) + return ret; + snd_soc_dapm_nc_pin(dapm, "ACIN"); snd_soc_dapm_nc_pin(dapm, "ACOP"); snd_soc_dapm_nc_pin(dapm, "OUT3"); |