aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa/z2.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/pxa/z2.c')
-rw-r--r--sound/soc/pxa/z2.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
index 4cc841b44182..cacbcd4a55eb 100644
--- a/sound/soc/pxa/z2.c
+++ b/sound/soc/pxa/z2.c
@@ -140,22 +140,23 @@ static const struct snd_soc_dapm_route audio_map[] = {
140static int z2_wm8750_init(struct snd_soc_pcm_runtime *rtd) 140static int z2_wm8750_init(struct snd_soc_pcm_runtime *rtd)
141{ 141{
142 struct snd_soc_codec *codec = rtd->codec; 142 struct snd_soc_codec *codec = rtd->codec;
143 struct snd_soc_dapm_context *dapm = &codec->dapm;
143 int ret; 144 int ret;
144 145
145 /* NC codec pins */ 146 /* NC codec pins */
146 snd_soc_dapm_disable_pin(codec, "LINPUT3"); 147 snd_soc_dapm_disable_pin(dapm, "LINPUT3");
147 snd_soc_dapm_disable_pin(codec, "RINPUT3"); 148 snd_soc_dapm_disable_pin(dapm, "RINPUT3");
148 snd_soc_dapm_disable_pin(codec, "OUT3"); 149 snd_soc_dapm_disable_pin(dapm, "OUT3");
149 snd_soc_dapm_disable_pin(codec, "MONO"); 150 snd_soc_dapm_disable_pin(dapm, "MONO");
150 151
151 /* Add z2 specific widgets */ 152 /* Add z2 specific widgets */
152 snd_soc_dapm_new_controls(codec, wm8750_dapm_widgets, 153 snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets,
153 ARRAY_SIZE(wm8750_dapm_widgets)); 154 ARRAY_SIZE(wm8750_dapm_widgets));
154 155
155 /* Set up z2 specific audio paths */ 156 /* Set up z2 specific audio paths */
156 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); 157 snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
157 158
158 ret = snd_soc_dapm_sync(codec); 159 ret = snd_soc_dapm_sync(dapm);
159 if (ret) 160 if (ret)
160 goto err; 161 goto err;
161 162