can: sunxi: Allwinner A10/A20 CAN Controller
Subsystems (2)
PATCH 1/2 can: sunxi: Allwinner A10/A20 CAN Controller
fixes a bug in arbitration error reporting
e9d2d74 sun4i_can_err: fix arbitration lost error reporting
Reported-by Dan Carpenter <[email protected]>
Signed-off-by Gerhard Bertelsmann <[email protected]>
---
drivers/net/can/sun4i_can.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/sun4i_can.c +1 -1
@@ -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 ; } }
PATCH 2/2 can: sunxi: Allwinner A10/A20 CAN Controller
change description of the module.
ef9bd57 general: fix driver info
Signed-off-by Gerhard Bertelsmann <[email protected]>
---
drivers/net/can/sun4i_can.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/sun4i_can.c +1 -1
@@ -854,4 +854,4 @@ module_platform_driver(sun4i_can_driver);MODULE_AUTHOR ("Peter Chen <[email protected]>" );MODULE_AUTHOR ("Gerhard Bertelsmann <[email protected]>" );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)" );
Marc Kleine-Budde
maintainerQuoted 6 lines · Gerhard Bertelsmann
fixes a bug in arbitration error reporting
e9d2d74
sun4i_can_err: fix arbitration lost error reportingReported-by Dan Carpenter <[email protected]>Signed-off-by Gerhard Bertelsmann <[email protected]>
Both applied to can-next. For the next patches, please don't include the git commit id in the patch, as it will change anyway. Please format the subject of the patch like this: "can: sun4i: <short description>" and in the patch itself, please provide a longer description. I've changed this while applying the patches.
Thanks,
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |