aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/s3c24xx/jive_wm8750.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/s3c24xx/jive_wm8750.c')
-rw-r--r--sound/soc/s3c24xx/jive_wm8750.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/sound/soc/s3c24xx/jive_wm8750.c b/sound/soc/s3c24xx/jive_wm8750.c
index 49605cd83947..e3599e283568 100644
--- a/sound/soc/s3c24xx/jive_wm8750.c
+++ b/sound/soc/s3c24xx/jive_wm8750.c
@@ -111,18 +111,19 @@ static struct snd_soc_ops jive_ops = {
111static int jive_wm8750_init(struct snd_soc_pcm_runtime *rtd) 111static int jive_wm8750_init(struct snd_soc_pcm_runtime *rtd)
112{ 112{
113 struct snd_soc_codec *codec = rtd->codec; 113 struct snd_soc_codec *codec = rtd->codec;
114 struct snd_soc_dapm_context *dapm = &codec->dapm;
114 int err; 115 int err;
115 116
116 /* These endpoints are not being used. */ 117 /* These endpoints are not being used. */
117 snd_soc_dapm_nc_pin(codec, "LINPUT2"); 118 snd_soc_dapm_nc_pin(dapm, "LINPUT2");
118 snd_soc_dapm_nc_pin(codec, "RINPUT2"); 119 snd_soc_dapm_nc_pin(dapm, "RINPUT2");
119 snd_soc_dapm_nc_pin(codec, "LINPUT3"); 120 snd_soc_dapm_nc_pin(dapm, "LINPUT3");
120 snd_soc_dapm_nc_pin(codec, "RINPUT3"); 121 snd_soc_dapm_nc_pin(dapm, "RINPUT3");
121 snd_soc_dapm_nc_pin(codec, "OUT3"); 122 snd_soc_dapm_nc_pin(dapm, "OUT3");
122 snd_soc_dapm_nc_pin(codec, "MONO"); 123 snd_soc_dapm_nc_pin(dapm, "MONO");
123 124
124 /* Add jive specific widgets */ 125 /* Add jive specific widgets */
125 err = snd_soc_dapm_new_controls(codec, wm8750_dapm_widgets, 126 err = snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets,
126 ARRAY_SIZE(wm8750_dapm_widgets)); 127 ARRAY_SIZE(wm8750_dapm_widgets));
127 if (err) { 128 if (err) {
128 printk(KERN_ERR "%s: failed to add widgets (%d)\n", 129 printk(KERN_ERR "%s: failed to add widgets (%d)\n",
@@ -130,8 +131,8 @@ static int jive_wm8750_init(struct snd_soc_pcm_runtime *rtd)
130 return err; 131 return err;
131 } 132 }
132 133
133 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); 134 snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
134 snd_soc_dapm_sync(codec); 135 snd_soc_dapm_sync(dapm);
135 136
136 return 0; 137 return 0;
137} 138}