commit d49371a3a74c0e87aea109a6a48fb2e52c22c9d6
author Linux Build Service Account <lnxbuild@quicinc.com> Mon May 08 13:12:41 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon May 08 13:12:41 2017 -0700
tree d79219f2529b8433dfc8b0c5d70b55908aad892f
parent a2804a83e94f76acca9a165ec475ba1c66d41fd9
parent d0b32d960b2cdc0864108ff2e2786b810dec619b

Merge "msm: vidc: Fix load calculation for specific core" into msm-4.9

drivers/media/platform/msm/vidc/msm_vidc_clocks.c

diff --git a/drivers/media/platform/msm/vidc/msm_vidc_clocks.c b/drivers/media/platform/msm/vidc/msm_vidc_clocks.c
index cd518fb..b80aa08 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc_clocks.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc_clocks.c
@@ -831,7 +831,7 @@
 	list_for_each_entry(inst, &core->instances, list) {
 		u32 cycles, lp_cycles;
 
-		if (!(inst->clk_data.core_id && core_id))
+		if (!(inst->clk_data.core_id & core_id))
 			continue;
 		if (inst->session_type == MSM_VIDC_DECODER) {
 			cycles = lp_cycles = inst->clk_data.entry->vpp_cycles;