diff options
| author | David S. Miller <davem@davemloft.net> | 2021-08-26 11:37:40 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-08-26 11:37:40 +0300 |
| commit | 92ea47fe09b531642e5b791d74645a6f08b23725 (patch) | |
| tree | 8c3793c008f835e3bddbe9c8190af54d69c50e0a | |
| parent | ec92e524ee91c98e6ee06807c7d69d9e2fd141bc (diff) | |
| parent | 044012b52029204900af9e4230263418427f4ba4 (diff) | |
| download | linux-92ea47fe09b531642e5b791d74645a6f08b23725.tar.xz | |
Merge tag 'linux-can-fixes-for-5.14-20210826' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine says:
====================
pull-request: can 2021-08-26
this is a pull request of a single patch for net/master.
Stefan Mätje's patch fixes the interchange of RX and TX error counters
inthe esd_usb2 CAN driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/can/usb/esd_usb2.c | 4 |
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 66fa8b07c2e6..95ae740fc311 100644 --- a/drivers/net/can/usb/esd_usb2.c +++ b/drivers/net/can/usb/esd_usb2.c @@ -224,8 +224,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) { |