can: esd_usb: Move mislocated storage of SJA1000_ECC_SEG bits in case of a bus error

[ Upstream commit 118469f88180438ef43dee93d71f77c00e7b425d ]

Move the supply for cf->data[3] (bit stream position of CAN error), in
case of a bus- or protocol-error, outside of the "switch (ecc &
SJA1000_ECC_MASK){}"-statement, because this bit stream position is
independent of the error type.

Fixes: 96d8e90382dc ("can: Add driver for esd CAN-USB/2 device")
Signed-off-by: Frank Jungclaus <frank.jungclaus@esd.eu>
Link: https://lore.kernel.org/all/20230216190450.3901254-2-frank.jungclaus@esd.eu
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c
index fbe1173b2651fb77a9f76e9fd388bf2e46bc80ca..b15154a6c53ebe5d067511b52c3c4f6436d50c4b 100644 (file)
--- a/drivers/net/can/usb/esd_usb2.c
+++ b/drivers/net/can/usb/esd_usb2.c
@@ -284,7 +284,6 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv,
                                cf->data[2] |= CAN_ERR_PROT_STUFF;
                                break;
                        default:
-                               cf->data[3] = ecc & SJA1000_ECC_SEG;
                                break;
                        }
 
@@ -292,6 +291,9 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv,
                        if (!(ecc & SJA1000_ECC_DIR))
                                cf->data[2] |= CAN_ERR_PROT_TX;
 
+                       /* Bit stream position in CAN frame as the error was detected */
+                       cf->data[3] = ecc & SJA1000_ECC_SEG;
+
                        if (priv->can.state == CAN_STATE_ERROR_WARNING ||
                            priv->can.state == CAN_STATE_ERROR_PASSIVE) {
                                cf->data[1] = (txerr > rxerr) ?