commit 894fb289dba2a26c72b932509b199fdb7d702ef6
author Linux Build Service Account <lnxbuild@localhost> Tue Mar 06 21:37:59 2018 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Mar 06 21:37:59 2018 -0800
tree 1f2c59b68558c1b46778259cc5dbee045638a02a
parent 460ad4e73c2f2408b78ddb0becf74c04f6cf78da
parent 9400cb84016214a08682c4d9726179e572e0c9a6

Merge "msm: ipa3: Use bitwise instead of logical operator"

drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c

diff --git a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c
index 48e7d7c..c3422d1 100644
--- a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c
@@ -2129,11 +2129,11 @@
 		return;
 	}
 
-	valmask->val = (1 << IPA_ENDP_INIT_AGGR_n_AGGR_FORCE_CLOSE_SHFT) &&
+	valmask->val = (1 << IPA_ENDP_INIT_AGGR_n_AGGR_FORCE_CLOSE_SHFT) &
 		IPA_ENDP_INIT_AGGR_n_AGGR_FORCE_CLOSE_BMSK;
 	valmask->mask = IPA_ENDP_INIT_AGGR_n_AGGR_FORCE_CLOSE_BMSK;
 
-	valmask->val |= ((0 << IPA_ENDP_INIT_AGGR_n_AGGR_EN_SHFT) &&
+	valmask->val |= ((0 << IPA_ENDP_INIT_AGGR_n_AGGR_EN_SHFT) &
 		IPA_ENDP_INIT_AGGR_n_AGGR_EN_BMSK);
 	valmask->mask |= IPA_ENDP_INIT_AGGR_n_AGGR_EN_BMSK;
 }