[PATCH 61/93] can: pch_can: fix invalid error codes

2013-02-05 Thread Herton Ronaldo Krzesinski
3.5.7.5 -stable review patch.  If anyone has any objections, please let me know.

--

From: Olivier Sobrie 

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 
Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Herton Ronaldo Krzesinski 
---
 drivers/net/can/pch_can.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 1226297..f25884a 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -560,7 +560,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++;
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 61/93] can: pch_can: fix invalid error codes

2013-02-05 Thread Herton Ronaldo Krzesinski
3.5.7.5 -stable review patch.  If anyone has any objections, please let me know.

--

From: Olivier Sobrie oliv...@sobrie.be

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 oliv...@sobrie.be
Signed-off-by: Marc Kleine-Budde m...@pengutronix.de
Signed-off-by: Herton Ronaldo Krzesinski herton.krzesin...@canonical.com
---
 drivers/net/can/pch_can.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 1226297..f25884a 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -560,7 +560,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++;
-- 
1.7.9.5

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/