diff options
-rw-r--r-- | include/sound/soc-dapm.h | 2 | ||||
-rw-r--r-- | sound/soc/soc-core.c | 2 | ||||
-rw-r--r-- | sound/soc/soc-dapm.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index c728d28ae9a5..27a72d5d4b00 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
@@ -413,7 +413,7 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card, | |||
413 | struct snd_soc_dapm_widget *sink); | 413 | struct snd_soc_dapm_widget *sink); |
414 | 414 | ||
415 | /* dapm path setup */ | 415 | /* dapm path setup */ |
416 | int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm); | 416 | int snd_soc_dapm_new_widgets(struct snd_soc_card *card); |
417 | void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm); | 417 | void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm); |
418 | int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm, | 418 | int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm, |
419 | const struct snd_soc_dapm_route *route, int num); | 419 | const struct snd_soc_dapm_route *route, int num); |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d476f752e3f1..ed3c253066b1 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -1807,7 +1807,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) | |||
1807 | list_for_each_entry(codec, &card->codec_dev_list, card_list) | 1807 | list_for_each_entry(codec, &card->codec_dev_list, card_list) |
1808 | snd_soc_dapm_auto_nc_codec_pins(codec); | 1808 | snd_soc_dapm_auto_nc_codec_pins(codec); |
1809 | 1809 | ||
1810 | snd_soc_dapm_new_widgets(&card->dapm); | 1810 | snd_soc_dapm_new_widgets(card); |
1811 | 1811 | ||
1812 | ret = snd_card_register(card->snd_card); | 1812 | ret = snd_card_register(card->snd_card); |
1813 | if (ret < 0) { | 1813 | if (ret < 0) { |
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 7e9afbc49ef2..548b1c9e875e 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -2712,9 +2712,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_weak_routes); | |||
2712 | * | 2712 | * |
2713 | * Returns 0 for success. | 2713 | * Returns 0 for success. |
2714 | */ | 2714 | */ |
2715 | int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm) | 2715 | int snd_soc_dapm_new_widgets(struct snd_soc_card *card) |
2716 | { | 2716 | { |
2717 | struct snd_soc_card *card = dapm->card; | ||
2718 | struct snd_soc_dapm_widget *w; | 2717 | struct snd_soc_dapm_widget *w; |
2719 | unsigned int val; | 2718 | unsigned int val; |
2720 | 2719 | ||