]> git.ipfire.org Git - thirdparty/kernel/stable.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>
Wed, 17 Aug 2022 12:41:09 +0000 (14:41 +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 a5b2952b8d0ff4d8eb6978405fee1f7fefbd2a1f..7dc88a9eca0f7130147708218797f6f77dea7947 100644 (file)
@@ -672,8 +672,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);
@@ -686,6 +684,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;
                        }
                }