aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/osk5912.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/omap/osk5912.c')
-rw-r--r--sound/soc/omap/osk5912.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c
index f0e662556428..c2a54204559d 100644
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/omap/osk5912.c
@@ -116,19 +116,20 @@ static const struct snd_soc_dapm_route audio_map[] = {
116static int osk_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd) 116static int osk_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
117{ 117{
118 struct snd_soc_codec *codec = rtd->codec; 118 struct snd_soc_codec *codec = rtd->codec;
119 struct snd_soc_dapm_context *dapm = &codec->dapm;
119 120
120 /* Add osk5912 specific widgets */ 121 /* Add osk5912 specific widgets */
121 snd_soc_dapm_new_controls(codec, tlv320aic23_dapm_widgets, 122 snd_soc_dapm_new_controls(dapm, tlv320aic23_dapm_widgets,
122 ARRAY_SIZE(tlv320aic23_dapm_widgets)); 123 ARRAY_SIZE(tlv320aic23_dapm_widgets));
123 124
124 /* Set up osk5912 specific audio path audio_map */ 125 /* Set up osk5912 specific audio path audio_map */
125 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); 126 snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
126 127
127 snd_soc_dapm_enable_pin(codec, "Headphone Jack"); 128 snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
128 snd_soc_dapm_enable_pin(codec, "Line In"); 129 snd_soc_dapm_enable_pin(dapm, "Line In");
129 snd_soc_dapm_enable_pin(codec, "Mic Jack"); 130 snd_soc_dapm_enable_pin(dapm, "Mic Jack");
130 131
131 snd_soc_dapm_sync(codec); 132 snd_soc_dapm_sync(dapm);
132 133
133 return 0; 134 return 0;
134} 135}