summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Mätje <stefan.maetje@esd.eu>2021-08-25 23:52:27 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-09-03 09:44:39 +0200
commit1f1a5e78b09dace7a899045c1a51ded3042a5569 (patch)
tree852905b6f4308f52aec96b68f4f91a694b157db5
parent2f1a46968ee42c305820c036532317c54ba8ee93 (diff)
downloadlinux-1f1a5e78b09dace7a899045c1a51ded3042a5569.tar.gz
linux-1f1a5e78b09dace7a899045c1a51ded3042a5569.tar.bz2
linux-1f1a5e78b09dace7a899045c1a51ded3042a5569.zip
can: usb: esd_usb2: esd_usb2_rx_event(): fix the interchange of the CAN RX and TX error counters
commit 044012b52029204900af9e4230263418427f4ba4 upstream. This patch fixes the interchanged fetch of the CAN RX and TX error counters from the ESD_EV_CAN_ERROR_EXT message. The RX error counter is really in struct rx_msg::data[2] and the TX error counter is in struct rx_msg::data[3]. Fixes: 96d8e90382dc ("can: Add driver for esd CAN-USB/2 device") Link: https://lore.kernel.org/r/20210825215227.4947-2-stefan.maetje@esd.eu Cc: stable@vger.kernel.org Signed-off-by: Stefan Mätje <stefan.maetje@esd.eu> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/can/usb/esd_usb2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c
index 592c6e7f3dca..fbe1173b2651 100644
--- a/drivers/net/can/usb/esd_usb2.c
+++ b/drivers/net/can/usb/esd_usb2.c
@@ -236,8 +236,8 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv,
if (id == ESD_EV_CAN_ERROR_EXT) {
u8 state = msg->msg.rx.data[0];
u8 ecc = msg->msg.rx.data[1];
- u8 txerr = msg->msg.rx.data[2];
- u8 rxerr = msg->msg.rx.data[3];
+ u8 rxerr = msg->msg.rx.data[2];
+ u8 txerr = msg->msg.rx.data[3];
skb = alloc_can_err_skb(priv->netdev, &cf);
if (skb == NULL) {