diff options
Diffstat (limited to 'sound/soc/pxa/poodle.c')
-rw-r--r-- | sound/soc/pxa/poodle.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index fb17a0a5a093..ef7c6c8dc8f1 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c | |||
@@ -241,19 +241,17 @@ static const struct snd_kcontrol_new wm8731_poodle_controls[] = { | |||
241 | */ | 241 | */ |
242 | static int poodle_wm8731_init(struct snd_soc_codec *codec) | 242 | static int poodle_wm8731_init(struct snd_soc_codec *codec) |
243 | { | 243 | { |
244 | int i, err; | 244 | int err; |
245 | 245 | ||
246 | snd_soc_dapm_nc_pin(codec, "LLINEIN"); | 246 | snd_soc_dapm_nc_pin(codec, "LLINEIN"); |
247 | snd_soc_dapm_nc_pin(codec, "RLINEIN"); | 247 | snd_soc_dapm_nc_pin(codec, "RLINEIN"); |
248 | snd_soc_dapm_enable_pin(codec, "MICIN"); | 248 | snd_soc_dapm_enable_pin(codec, "MICIN"); |
249 | 249 | ||
250 | /* Add poodle specific controls */ | 250 | /* Add poodle specific controls */ |
251 | for (i = 0; i < ARRAY_SIZE(wm8731_poodle_controls); i++) { | 251 | err = snd_soc_add_controls(codec, wm8731_poodle_controls, |
252 | err = snd_ctl_add(codec->card, | 252 | ARRAY_SIZE(wm8731_poodle_controls)); |
253 | snd_soc_cnew(&wm8731_poodle_controls[i], codec, NULL)); | 253 | if (err < 0) |
254 | if (err < 0) | 254 | return err; |
255 | return err; | ||
256 | } | ||
257 | 255 | ||
258 | /* Add poodle specific widgets */ | 256 | /* Add poodle specific widgets */ |
259 | snd_soc_dapm_new_controls(codec, wm8731_dapm_widgets, | 257 | snd_soc_dapm_new_controls(codec, wm8731_dapm_widgets, |