projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: bcmgenet: fix dma api length mismatch
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
can
/
sun4i_can.c
diff --git
a/drivers/net/can/sun4i_can.c
b/drivers/net/can/sun4i_can.c
index d9a42c6467836cdf3aa00adc1d5a4f059b97469e..68ef0a4cd82153cd65699ab0a4d80a5a201393e6 100644
(file)
--- a/
drivers/net/can/sun4i_can.c
+++ b/
drivers/net/can/sun4i_can.c
@@
-575,7
+575,6
@@
static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status)
cf->data[2] |= CAN_ERR_PROT_STUFF;
break;
default:
cf->data[2] |= CAN_ERR_PROT_STUFF;
break;
default:
- cf->data[2] |= CAN_ERR_PROT_UNSPEC;
cf->data[3] = (ecc & SUN4I_STA_ERR_SEG_CODE)
>> 16;
break;
cf->data[3] = (ecc & SUN4I_STA_ERR_SEG_CODE)
>> 16;
break;