can: kvaser_usb_leaf: do not report txerr and rxerr during bus-off
authorVincent Mailhol <mailhol.vincent@wanadoo.fr>
Tue, 19 Jul 2022 14:35:46 +0000 (23:35 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 12:23:33 +0000 (14:23 +0200)
[ Upstream commit a57732084e06791d37ea1ea447cca46220737abd ]

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

Fixes: 7259124eac7d1 ("can: kvaser_usb: Split driver into kvaser_usb_core.c and kvaser_usb_leaf.c")
Link: https://lore.kernel.org/all/20220719143550.3681-9-mailhol.vincent@wanadoo.fr
CC: Jimmy Assarsson <extja@kvaser.com>
Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c

index b9c2231e4b43e62d6ef974a95a074eddb344033f..05d54c4f929fe5776d7c43e3c0eac4dcdcb29c2d 100644 (file)
@@ -857,8 +857,10 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev,
                break;
        }
 
-       cf->data[6] = es->txerr;
-       cf->data[7] = es->rxerr;
+       if (new_state != CAN_STATE_BUS_OFF) {
+               cf->data[6] = es->txerr;
+               cf->data[7] = es->rxerr;
+       }
 
        stats->rx_packets++;
        stats->rx_bytes += cf->len;