projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
can: m_can.c: fix setup of CCCR register: clear CCCR NISO bit before checking can...
[linux-2.6-microblaze.git]
/
drivers
/
net
/
can
/
m_can
/
m_can.c
diff --git
a/drivers/net/can/m_can/m_can.c
b/drivers/net/can/m_can/m_can.c
index
b397a33
..
8e2b7f8
100644
(file)
--- a/
drivers/net/can/m_can/m_can.c
+++ b/
drivers/net/can/m_can/m_can.c
@@
-1109,7
+1109,8
@@
static void m_can_chip_config(struct net_device *dev)
} else {
/* Version 3.1.x or 3.2.x */
} else {
/* Version 3.1.x or 3.2.x */
- cccr &= ~(CCCR_TEST | CCCR_MON | CCCR_BRSE | CCCR_FDOE);
+ cccr &= ~(CCCR_TEST | CCCR_MON | CCCR_BRSE | CCCR_FDOE |
+ CCCR_NISO);
/* Only 3.2.x has NISO Bit implemented */
if (priv->can.ctrlmode & CAN_CTRLMODE_FD_NON_ISO)
/* Only 3.2.x has NISO Bit implemented */
if (priv->can.ctrlmode & CAN_CTRLMODE_FD_NON_ISO)