can: sun4i_can: sun4i_can_err(): call can_change_state() even if cf is NULL

[ Upstream commit ee6bf3677ae03569d833795064e17f605c2163c7 ]

Call the function can_change_state() if the allocation of the skb
fails, as it handles the cf parameter when it is null.

Additionally, this ensures that the statistics related to state error
counters (i. e. warning, passive, and bus-off) are updated.

Fixes: 0738eff14d81 ("can: Allwinner A10/A20 CAN Controller support - Kernel module")
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Link: https://patch.msgid.link/20241122221650.633981-3-dario.binacchi@amarulasolutions.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c
index ab9adfe92a94bb60a51d132d7009bd29ea0359e8..aad1882a9be11f6e0618229affd0bf9fea38339a 100644 (file)
--- a/drivers/net/can/sun4i_can.c
+++ b/drivers/net/can/sun4i_can.c
@@ -613,10 +613,10 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status)
                tx_state = txerr >= rxerr ? state : 0;
                rx_state = txerr <= rxerr ? state : 0;
 
-               if (likely(skb))
-                       can_change_state(dev, cf, tx_state, rx_state);
-               else
-                       priv->can.state = state;
+               /* The skb allocation might fail, but can_change_state()
+                * handles cf == NULL.
+                */
+               can_change_state(dev, cf, tx_state, rx_state);
                if (state == CAN_STATE_BUS_OFF)
                        can_bus_off(dev);
        }