OSDN Git Service

soc: xilinx: xlnx_vcu: Use bitwise & rather than logical && on clkoutdiv
authorGustavo A. R. Silva <garsilva@embeddedor.com>
Mon, 15 Jan 2018 19:15:28 +0000 (13:15 -0600)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 16 Jan 2018 14:50:20 +0000 (15:50 +0100)
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 <garsilva@embeddedor.com>
Acked-by: Dhaval Shah <dshah@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/soc/xilinx/xlnx_vcu.c

index c1d6f1b..a840c02 100644 (file)
@@ -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;