aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorOlivier Sobrie <olivier@sobrie.be>2013-01-18 09:32:41 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-03 18:21:37 -0600
commitbb40f9f8a41f8c8c793c375f5f3613d99990b705 (patch)
treefd7a46b020a09764c78dee700317e55ec83e474a /drivers
parent831362319d56e37311b0893ad2dcc4c8f970cbde (diff)
downloadkernel_samsung_smdk4412-bb40f9f8a41f8c8c793c375f5f3613d99990b705.zip
kernel_samsung_smdk4412-bb40f9f8a41f8c8c793c375f5f3613d99990b705.tar.gz
kernel_samsung_smdk4412-bb40f9f8a41f8c8c793c375f5f3613d99990b705.tar.bz2
can: pch_can: fix invalid error codes
commit ee50e135aeb048b90fab662e661c58b67341830b 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> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/can/pch_can.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index d11fbb2..b508a63 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -559,7 +559,7 @@ static void pch_can_error(struct net_device *ndev, u32 status)
stats->rx_errors++;
break;
case PCH_CRC_ERR:
- cf->data[2] |= CAN_ERR_PROT_LOC_CRC_SEQ |
+ cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ |
CAN_ERR_PROT_LOC_CRC_DEL;
priv->can.can_stats.bus_error++;
stats->rx_errors++;