diff options
author | Olivier Sobrie <olivier@sobrie.be> | 2013-01-18 03:32:39 -0500 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-01-26 11:11:24 -0500 |
commit | 6ea45886865c1abb01bb861f7f6bdd5d0f398cb3 (patch) | |
tree | c0618382dac05441a3beadbff06c04d2ee852c3b | |
parent | 5d0feaff230c0abfe4a112e6f09f096ed99e0b2d (diff) |
can: c_can: fix invalid error codes
Errors in CAN protocol (location) are reported in data[3] of the can
frame instead of data[2].
Cc: linux-stable <stable@vger.kernel.org>
Cc: Bhupesh Sharma <bhupesh.sharma@st.com>
Signed-off-by: Olivier Sobrie <olivier@sobrie.be>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r-- | drivers/net/can/c_can/c_can.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index 5233b8f58d77..58607f196c9e 100644 --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c | |||
@@ -960,7 +960,7 @@ static int c_can_handle_bus_err(struct net_device *dev, | |||
960 | break; | 960 | break; |
961 | case LEC_ACK_ERROR: | 961 | case LEC_ACK_ERROR: |
962 | netdev_dbg(dev, "ack error\n"); | 962 | netdev_dbg(dev, "ack error\n"); |
963 | cf->data[2] |= (CAN_ERR_PROT_LOC_ACK | | 963 | cf->data[3] |= (CAN_ERR_PROT_LOC_ACK | |
964 | CAN_ERR_PROT_LOC_ACK_DEL); | 964 | CAN_ERR_PROT_LOC_ACK_DEL); |
965 | break; | 965 | break; |
966 | case LEC_BIT1_ERROR: | 966 | case LEC_BIT1_ERROR: |
@@ -973,7 +973,7 @@ static int c_can_handle_bus_err(struct net_device *dev, | |||
973 | break; | 973 | break; |
974 | case LEC_CRC_ERROR: | 974 | case LEC_CRC_ERROR: |
975 | netdev_dbg(dev, "CRC error\n"); | 975 | netdev_dbg(dev, "CRC error\n"); |
976 | cf->data[2] |= (CAN_ERR_PROT_LOC_CRC_SEQ | | 976 | cf->data[3] |= (CAN_ERR_PROT_LOC_CRC_SEQ | |
977 | CAN_ERR_PROT_LOC_CRC_DEL); | 977 | CAN_ERR_PROT_LOC_CRC_DEL); |
978 | break; | 978 | break; |
979 | default: | 979 | default: |