diff options
| author | Jeeja KP <jeeja.kp@intel.com> | 2016-06-15 07:46:55 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-06-15 11:19:27 +0200 |
| commit | 09464974eaa8325c4cd22c3cab743a110644fb31 (patch) | |
| tree | b7e7dc1758ed2479de0a32f5efd344b12165b173 /sound/soc/soc-dapm.c | |
| parent | ASoC: dpcm: play nice with CODEC<->CODEC links (diff) | |
| download | linux-09464974eaa8325c4cd22c3cab743a110644fb31.tar.xz linux-09464974eaa8325c4cd22c3cab743a110644fb31.zip | |
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 <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 6 |
1 files changed, 4 insertions, 2 deletions
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); |