diff options
| author | Olivier Sobrie <olivier@sobrie.be> | 2013-01-18 09:32:40 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-03 18:21:36 -0600 |
| commit | 831362319d56e37311b0893ad2dcc4c8f970cbde (patch) | |
| tree | 9bf477714a648e3030442afd9be496568a17a1be | |
| parent | 331f275adb3f494f15e610cf7c3abf324d573d81 (diff) | |
| download | kernel_samsung_aries-831362319d56e37311b0893ad2dcc4c8f970cbde.zip kernel_samsung_aries-831362319d56e37311b0893ad2dcc4c8f970cbde.tar.gz kernel_samsung_aries-831362319d56e37311b0893ad2dcc4c8f970cbde.tar.bz2 | |
can: ti_hecc: fix invalid error codes
commit 71088c4bd9b8f8cbffb0e66f2abc14297e4b2ca8 upstream.
Errors in CAN protocol (location) are reported in data[3] of the can
frame instead of data[2].
Signed-off-by: Olivier Sobrie <olivier@sobrie.be>
Cc: Anant Gole <anantgole@ti.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/can/ti_hecc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c index 6ea2c09..10b2394 100644 --- a/drivers/net/can/ti_hecc.c +++ b/drivers/net/can/ti_hecc.c @@ -734,12 +734,12 @@ static int ti_hecc_error(struct net_device *ndev, int int_status, } if (err_status & HECC_CANES_CRCE) { hecc_set_bit(priv, HECC_CANES, HECC_CANES_CRCE); - cf->data[2] |= CAN_ERR_PROT_LOC_CRC_SEQ | + cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ | CAN_ERR_PROT_LOC_CRC_DEL; } if (err_status & HECC_CANES_ACKE) { hecc_set_bit(priv, HECC_CANES, HECC_CANES_ACKE); - cf->data[2] |= CAN_ERR_PROT_LOC_ACK | + cf->data[3] |= CAN_ERR_PROT_LOC_ACK | CAN_ERR_PROT_LOC_ACK_DEL; } } |