aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/s3c24xx/rx1950_uda1380.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/s3c24xx/rx1950_uda1380.c')
-rw-r--r--sound/soc/s3c24xx/rx1950_uda1380.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/s3c24xx/rx1950_uda1380.c b/sound/soc/s3c24xx/rx1950_uda1380.c
index ffd5cf2fb0a9..105d177fa427 100644
--- a/sound/soc/s3c24xx/rx1950_uda1380.c
+++ b/sound/soc/s3c24xx/rx1950_uda1380.c
@@ -232,26 +232,27 @@ static int rx1950_hw_params(struct snd_pcm_substream *substream,
232static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd) 232static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd)
233{ 233{
234 struct snd_soc_codec *codec = rtd->codec; 234 struct snd_soc_codec *codec = rtd->codec;
235 struct snd_soc_dapm_context *dapm = &codec->dapm;
235 int err; 236 int err;
236 237
237 /* Add rx1950 specific widgets */ 238 /* Add rx1950 specific widgets */
238 err = snd_soc_dapm_new_controls(codec, uda1380_dapm_widgets, 239 err = snd_soc_dapm_new_controls(dapm, uda1380_dapm_widgets,
239 ARRAY_SIZE(uda1380_dapm_widgets)); 240 ARRAY_SIZE(uda1380_dapm_widgets));
240 241
241 if (err) 242 if (err)
242 return err; 243 return err;
243 244
244 /* Set up rx1950 specific audio path audio_mapnects */ 245 /* Set up rx1950 specific audio path audio_mapnects */
245 err = snd_soc_dapm_add_routes(codec, audio_map, 246 err = snd_soc_dapm_add_routes(dapm, audio_map,
246 ARRAY_SIZE(audio_map)); 247 ARRAY_SIZE(audio_map));
247 248
248 if (err) 249 if (err)
249 return err; 250 return err;
250 251
251 snd_soc_dapm_enable_pin(codec, "Headphone Jack"); 252 snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
252 snd_soc_dapm_enable_pin(codec, "Speaker"); 253 snd_soc_dapm_enable_pin(dapm, "Speaker");
253 254
254 snd_soc_dapm_sync(codec); 255 snd_soc_dapm_sync(dapm);
255 256
256 snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE, 257 snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
257 &hp_jack); 258 &hp_jack);