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
arm64: dts: rockchip: update thermal config and add gpu's parameters for rk3368
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
can
/
bfin_can.c
diff --git
a/drivers/net/can/bfin_can.c
b/drivers/net/can/bfin_can.c
index 57dadd52b428a536d71f2364c006641e5e765083..1deb8ff90a89528e147b42353500d1610ff4a285 100644
(file)
--- a/
drivers/net/can/bfin_can.c
+++ b/
drivers/net/can/bfin_can.c
@@
-501,8
+501,6
@@
static int bfin_can_err(struct net_device *dev, u16 isrc, u16 status)
cf->data[2] |= CAN_ERR_PROT_FORM;
else if (status & SER)
cf->data[2] |= CAN_ERR_PROT_STUFF;
- else
- cf->data[2] |= CAN_ERR_PROT_UNSPEC;
}
priv->can.state = state;