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

Commit 80b135a0 authored by Vincent Mailhol's avatar Vincent Mailhol Committed by Greg Kroah-Hartman
Browse files

can: sun4i_can: do not report txerr and rxerr during bus-off 

[ Upstream commit 0ac15a8f661b941519379831d09bfb12271b23ee ]

During bus off, the error count is greater than 255 and can not fit in
a u8.

Fixes: 0738eff1 ("can: Allwinner A10/A20 CAN Controller support - Kernel module")
Link: https://lore.kernel.org/all/20220719143550.3681-7-mailhol.vincent@wanadoo.fr


CC: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d20bf7e7

drivers/net/can/sun4i_can.c

+4 −5
Original line number Diff line number Diff line
@@ -525,11 +525,6 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status) 
	rxerr = (errc >> 16) & 0xFF;

	txerr = errc & 0xFF;



	if (skb) {

		cf->data[6] = txerr;

		cf->data[7] = rxerr;

	}



	if (isrc & SUN4I_INT_DATA_OR) {

		/* data overrun interrupt */

		netdev_dbg(dev, "data overrun interrupt\n");
@@ -560,6 +555,10 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status) 
		else

			state = CAN_STATE_ERROR_ACTIVE;

	}

	if (skb && state != CAN_STATE_BUS_OFF) {

		cf->data[6] = txerr;

		cf->data[7] = rxerr;

	}

	if (isrc & SUN4I_INT_BUS_ERR) {

		/* bus error interrupt */

		netdev_dbg(dev, "bus error interrupt\n");