Skip to contentSkip to conversation

soc: xilinx: xlnx_vcu: Fix && vs & typo

PATCH In review Dan Carpenter 2 participants 2 messages Jan 18, 2018

Subsystems (2)
Kernel janitors Arm/Zynq architecture
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 soc: xilinx: xlnx_vcu: Fix && vs & typo

We accidentally used a logical AND instead of a bitwise AND here.

Fixes cee8113a295a ("soc: xilinx: xlnx_vcu: Add Xilinx ZYNQMP VCU logicoreIP init driver")
Signed-off-by Dan Carpenter <[email protected]>
drivers/soc/xilinx/xlnx_vcu.c +1 -1
index c1d6f1b190b6..a840c0272135 100644
@@ -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;
#1 lore raw
Quoted 11 lines · Dan Carpenter

We accidentally used a logical AND instead of a bitwise AND here.

Fixes cee8113a295a ("soc: xilinx: xlnx_vcu: Add Xilinx ZYNQMP VCU logicoreIP init driver")
Signed-off-by Dan Carpenter <[email protected]>
drivers/soc/xilinx/xlnx_vcu.c +0 -0
index c1d6f1b190b6..a840c0272135 100644

drivers/soc/xilinx/xlnx_vcu.c static int xvcu_set_vcu_pll_info(struct xvcu_device *xvcu) · line 340

Quoted 8 lines
drivers/soc/xilinx/xlnx_vcu.c +1 -1
@@ -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;

Already fixed by https://www.spinics.net/lists/arm-kernel/msg628989.html

Thanks,
Michal