From: Gustavo A. R. Silva Date: Mon, 15 Jan 2018 19:15:28 +0000 (-0600) Subject: soc: xilinx: xlnx_vcu: Use bitwise & rather than logical && on clkoutdiv X-Git-Tag: v4.16-rc1~98^2~1^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a7157b137f6f4804fbd60e8734574373212105b;p=thirdparty%2Fkernel%2Flinux.git soc: xilinx: xlnx_vcu: Use bitwise & rather than logical && on clkoutdiv Currently clkoutdiv is being operated on by a logical && operator rather than a bitwise & operator. This looks incorrect as these should be bit flag operations. Addresses-Coverity-ID: 1463959 ("Logical vs. bitwise operator") Fixes: cee8113a295a ("soc: xilinx: xlnx_vcu: Add Xilinx ZYNQMP VCU logicoreIP init driver") Signed-off-by: Gustavo A. R. Silva Acked-by: Dhaval Shah Signed-off-by: Michal Simek --- diff --git a/drivers/soc/xilinx/xlnx_vcu.c b/drivers/soc/xilinx/xlnx_vcu.c index c1d6f1b190b64..a840c02721355 100644 --- a/drivers/soc/xilinx/xlnx_vcu.c +++ b/drivers/soc/xilinx/xlnx_vcu.c @@ -334,7 +334,7 @@ static int xvcu_set_vcu_pll_info(struct xvcu_device *xvcu) */ vcu_pll_ctrl = xvcu_read(xvcu->vcu_slcr_ba, VCU_PLL_CTRL); clkoutdiv = vcu_pll_ctrl >> VCU_PLL_CTRL_CLKOUTDIV_SHIFT; - clkoutdiv = clkoutdiv && VCU_PLL_CTRL_CLKOUTDIV_MASK; + clkoutdiv = clkoutdiv & VCU_PLL_CTRL_CLKOUTDIV_MASK; if (clkoutdiv != 1) { dev_err(xvcu->dev, "clkoutdiv value is invalid\n"); return -EINVAL;