Loading sound/soc/pxa/corgi.c +5 −6 Original line number Diff line number Diff line Loading @@ -303,15 +303,13 @@ static int corgi_wm8731_init(struct snd_soc_codec *codec) } /* Add corgi specific widgets */ for(i = 0; i < ARRAY_SIZE(wm8731_dapm_widgets); i++) { for (i = 0; i < ARRAY_SIZE(wm8731_dapm_widgets); i++) snd_soc_dapm_new_control(codec, &wm8731_dapm_widgets[i]); } /* Set up corgi specific audio path audio_map */ for(i = 0; audio_map[i][0] != NULL; i++) { for (i = 0; audio_map[i][0] != NULL; i++) snd_soc_dapm_connect_input(codec, audio_map[i][0], audio_map[i][1], audio_map[i][2]); } snd_soc_dapm_sync_endpoints(codec); return 0; Loading Loading @@ -353,7 +351,8 @@ static int __init corgi_init(void) { int ret; if (!(machine_is_corgi() || machine_is_shepherd() || machine_is_husky())) if (!(machine_is_corgi() || machine_is_shepherd() || machine_is_husky())) return -ENODEV; corgi_snd_device = platform_device_alloc("soc-audio", -1); Loading Loading
sound/soc/pxa/corgi.c +5 −6 Original line number Diff line number Diff line Loading @@ -303,15 +303,13 @@ static int corgi_wm8731_init(struct snd_soc_codec *codec) } /* Add corgi specific widgets */ for(i = 0; i < ARRAY_SIZE(wm8731_dapm_widgets); i++) { for (i = 0; i < ARRAY_SIZE(wm8731_dapm_widgets); i++) snd_soc_dapm_new_control(codec, &wm8731_dapm_widgets[i]); } /* Set up corgi specific audio path audio_map */ for(i = 0; audio_map[i][0] != NULL; i++) { for (i = 0; audio_map[i][0] != NULL; i++) snd_soc_dapm_connect_input(codec, audio_map[i][0], audio_map[i][1], audio_map[i][2]); } snd_soc_dapm_sync_endpoints(codec); return 0; Loading Loading @@ -353,7 +351,8 @@ static int __init corgi_init(void) { int ret; if (!(machine_is_corgi() || machine_is_shepherd() || machine_is_husky())) if (!(machine_is_corgi() || machine_is_shepherd() || machine_is_husky())) return -ENODEV; corgi_snd_device = platform_device_alloc("soc-audio", -1); Loading