diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/pxa/corgi.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index 1a70a6ac98ce..7f32a1167572 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c | |||
@@ -297,21 +297,19 @@ static int corgi_wm8731_init(struct snd_soc_codec *codec) | |||
297 | /* Add corgi specific controls */ | 297 | /* Add corgi specific controls */ |
298 | for (i = 0; i < ARRAY_SIZE(wm8731_corgi_controls); i++) { | 298 | for (i = 0; i < ARRAY_SIZE(wm8731_corgi_controls); i++) { |
299 | err = snd_ctl_add(codec->card, | 299 | err = snd_ctl_add(codec->card, |
300 | snd_soc_cnew(&wm8731_corgi_controls[i],codec, NULL)); | 300 | snd_soc_cnew(&wm8731_corgi_controls[i], codec, NULL)); |
301 | if (err < 0) | 301 | if (err < 0) |
302 | return err; | 302 | return err; |
303 | } | 303 | } |
304 | 304 | ||
305 | /* Add corgi specific widgets */ | 305 | /* Add corgi specific widgets */ |
306 | for(i = 0; i < ARRAY_SIZE(wm8731_dapm_widgets); i++) { | 306 | for (i = 0; i < ARRAY_SIZE(wm8731_dapm_widgets); i++) |
307 | snd_soc_dapm_new_control(codec, &wm8731_dapm_widgets[i]); | 307 | snd_soc_dapm_new_control(codec, &wm8731_dapm_widgets[i]); |
308 | } | ||
309 | 308 | ||
310 | /* Set up corgi specific audio path audio_map */ | 309 | /* Set up corgi specific audio path audio_map */ |
311 | for(i = 0; audio_map[i][0] != NULL; i++) { | 310 | for (i = 0; audio_map[i][0] != NULL; i++) |
312 | snd_soc_dapm_connect_input(codec, audio_map[i][0], | 311 | snd_soc_dapm_connect_input(codec, audio_map[i][0], |
313 | audio_map[i][1], audio_map[i][2]); | 312 | audio_map[i][1], audio_map[i][2]); |
314 | } | ||
315 | 313 | ||
316 | snd_soc_dapm_sync_endpoints(codec); | 314 | snd_soc_dapm_sync_endpoints(codec); |
317 | return 0; | 315 | return 0; |
@@ -353,7 +351,8 @@ static int __init corgi_init(void) | |||
353 | { | 351 | { |
354 | int ret; | 352 | int ret; |
355 | 353 | ||
356 | if (!(machine_is_corgi() || machine_is_shepherd() || machine_is_husky())) | 354 | if (!(machine_is_corgi() || machine_is_shepherd() || |
355 | machine_is_husky())) | ||
357 | return -ENODEV; | 356 | return -ENODEV; |
358 | 357 | ||
359 | corgi_snd_device = platform_device_alloc("soc-audio", -1); | 358 | corgi_snd_device = platform_device_alloc("soc-audio", -1); |