Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[deliverable/linux.git] / sound / soc / soc-dapm.c

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index db781f6faaec42a55c132f63619b828fd743cec2..8698c26773b3c8d43e52a5610155348d6261a2e5 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1092,8 +1092,10 @@ static __always_inline int is_connected_ep(struct snd_soc_dapm_widget *widget,
        if (list)
                list_add_tail(&widget->work_list, list);
 
-       if (custom_stop_condition && custom_stop_condition(widget, dir))
-               return con;
+       if (custom_stop_condition && custom_stop_condition(widget, dir)) {
+               widget->endpoints[dir] = 1;
+               return widget->endpoints[dir];
+       }
 
        if ((widget->is_ep & SND_SOC_DAPM_DIR_TO_EP(dir)) && widget->connected) {
                widget->endpoints[dir] = snd_soc_dapm_suspend_check(widget);
@@ -3314,6 +3316,7 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
        mutex_unlock(&dapm->card->dapm_mutex);
        return w;
 }
+EXPORT_SYMBOL_GPL(snd_soc_dapm_new_control);
 
 struct snd_soc_dapm_widget *
 snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,