linux-can.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/1] can: Allwinner A10/A20 CAN Controller
@ 2015-09-24  5:54 Gerhard Bertelsmann
  2015-09-24  6:58 ` Marc Kleine-Budde
  0 siblings, 1 reply; 2+ messages in thread
From: Gerhard Bertelsmann @ 2015-09-24  5:54 UTC (permalink / raw)
  To: mkl, linux-can; +Cc: Gerhard Bertelsmann

This patch set (linux-next) fixes a bug in arbitration error reporting found by
Dan Carpenter and the modinfo name (thx to Peter Koorsgard) of the module.

ef9bd57 general: fix driver info
e9d2d74 sun4i_can_err: fix arbitration lost error reporting

Signed-off-by: Gerhard Bertelsmann <info@gerhard-bertelsmann.de>
---

 drivers/net/can/sun4i_can.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c
index 10d8497..d9a42c6 100644
--- a/drivers/net/can/sun4i_can.c
+++ b/drivers/net/can/sun4i_can.c
@@ -601,7 +601,7 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status)
 		stats->tx_errors++;
 		if (likely(skb)) {
 			cf->can_id |= CAN_ERR_LOSTARB;
-			cf->data[0] = (alc & 0x1f) >> 8;
+			cf->data[0] = (alc >> 8) & 0x1f;
 		}
 	}
 
@@ -854,4 +854,4 @@ module_platform_driver(sun4i_can_driver);
 MODULE_AUTHOR("Peter Chen <xingkongcp@gmail.com>");
 MODULE_AUTHOR("Gerhard Bertelsmann <info@gerhard-bertelsmann.de>");
 MODULE_LICENSE("Dual BSD/GPL");
-MODULE_DESCRIPTION(DRV_NAME "CAN driver for Allwinner SoCs (A10/A20)");
+MODULE_DESCRIPTION("CAN driver for Allwinner SoCs (A10/A20)");

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-09-24  6:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-24  5:54 [PATCH 1/1] can: Allwinner A10/A20 CAN Controller Gerhard Bertelsmann
2015-09-24  6:58 ` Marc Kleine-Budde

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).