]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
can: hi311x: do not report txerr and rxerr during bus-off
authorVincent Mailhol <mailhol.vincent@wanadoo.fr>
Tue, 19 Jul 2022 14:35:43 +0000 (23:35 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 21 Aug 2022 13:15:48 +0000 (15:15 +0200)
[ Upstream commit a22bd630cfff496b270211745536e50e98eb3a45 ]

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

Fixes: 57e83fb9b746 ("can: hi311x: Add Holt HI-311x CAN driver")
Link: https://lore.kernel.org/all/20220719143550.3681-6-mailhol.vincent@wanadoo.fr
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/spi/hi311x.c

index 7d2315c8cacb1fe018e78bc78378c25be81c341b..28273e84171a251f99afc3d43c3c791145cd96d0 100644 (file)
@@ -670,8 +670,6 @@ static irqreturn_t hi3110_can_ist(int irq, void *dev_id)
 
                        txerr = hi3110_read(spi, HI3110_READ_TEC);
                        rxerr = hi3110_read(spi, HI3110_READ_REC);
-                       cf->data[6] = txerr;
-                       cf->data[7] = rxerr;
                        tx_state = txerr >= rxerr ? new_state : 0;
                        rx_state = txerr <= rxerr ? new_state : 0;
                        can_change_state(net, cf, tx_state, rx_state);
@@ -684,6 +682,9 @@ static irqreturn_t hi3110_can_ist(int irq, void *dev_id)
                                        hi3110_hw_sleep(spi);
                                        break;
                                }
+                       } else {
+                               cf->data[6] = txerr;
+                               cf->data[7] = rxerr;
                        }
                }