Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9cb9bd6 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

can: c_can: precedence error in c_can_chip_config() 



(CAN_CTRLMODE_LISTENONLY & CAN_CTRLMODE_LOOPBACK) is (0x02 & 0x01) which
is zero so the condition is never true.  The intent here was to test
that both flags were set.

Cc: <stable@kernel.org> # 2.6.39+
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 424d54d2

drivers/net/can/c_can/c_can.c

+2 −2
Original line number Diff line number Diff line
@@ -590,8 +590,8 @@ static void c_can_chip_config(struct net_device *dev) 
	priv->write_reg(priv, &priv->regs->control,

			CONTROL_ENABLE_AR);



	if (priv->can.ctrlmode & (CAN_CTRLMODE_LISTENONLY &

					CAN_CTRLMODE_LOOPBACK)) {

	if ((priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) &&

	    (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK)) {

		/* loopback + silent mode : useful for hot self-test */

		priv->write_reg(priv, &priv->regs->control, CONTROL_EIE |

				CONTROL_SIE | CONTROL_IE | CONTROL_TEST);