summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorJeeja KP <jeeja.kp@intel.com>2016-02-03 17:59:49 +0530
committerMark Brown <broonie@kernel.org>2016-02-04 11:36:14 +0000
commit0c684c48257bc6033bdd3b942babef22d0a1852a (patch)
tree7f202cedb5e0477d1d81c32b5776c154909b134a /sound
parent9cf3049e21e4e6873aae45df19c11f7243e2f03f (diff)
downloadlinux-stable-0c684c48257bc6033bdd3b942babef22d0a1852a.tar.gz
linux-stable-0c684c48257bc6033bdd3b942babef22d0a1852a.tar.bz2
linux-stable-0c684c48257bc6033bdd3b942babef22d0a1852a.zip
ASoC: Intel: Skylake: Fix the module state check condition
For binding modules we should check if source or destination module is in UNINT state. We canot bind even if one of them is in this state. So update the check from logical AND to logical OR and do not bind modules for this case 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')
-rw-r--r--sound/soc/intel/skylake/skl-messages.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c
index bb5f1d7d0cad..4629372d7c8e 100644
--- a/sound/soc/intel/skylake/skl-messages.c
+++ b/sound/soc/intel/skylake/skl-messages.c
@@ -747,7 +747,7 @@ int skl_bind_modules(struct skl_sst *ctx,
skl_dump_bind_info(ctx, src_mcfg, dst_mcfg);
- if (src_mcfg->m_state < SKL_MODULE_INIT_DONE &&
+ if (src_mcfg->m_state < SKL_MODULE_INIT_DONE ||
dst_mcfg->m_state < SKL_MODULE_INIT_DONE)
return 0;