From: Jeeja KP Date: Wed, 15 Jun 2016 05:46:55 +0000 (+0530) Subject: ASoC: dapm: Fix to return correct path list in is_connected_ep. X-Git-Tag: v4.8-rc1~84^2~1^2~7^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=09464974eaa8325c4cd22c3cab743a110644fb31;p=karo-tx-linux.git ASoC: dapm: Fix to return correct path list in is_connected_ep. In is_connected_ep, when custom_stop_condition is true, need to return the correct paths instead of con which is 0. Fixes: 6742064aef7f('ASoC: dapm: support user-defined stop condition in dai_get_connected_widgets') Signed-off-by: Jeeja KP Signed-off-by: Vinod Koul Signed-off-by: Mark Brown --- diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index db781f6faaec..3c3f027d21bd 100644 --- 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);