projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/fix/ac97', 'asoc/fix/atmel', 'asoc/fix/intel...
[cascardo/linux.git]
/
drivers
/
net
/
can
/
c_can
/
c_can.c
diff --git
a/drivers/net/can/c_can/c_can.c
b/drivers/net/can/c_can/c_can.c
index
f94a9fa
..
c672c4d
100644
(file)
--- a/
drivers/net/can/c_can/c_can.c
+++ b/
drivers/net/can/c_can/c_can.c
@@
-615,6
+615,9
@@
static void c_can_stop(struct net_device *dev)
c_can_irq_control(priv, false);
c_can_irq_control(priv, false);
+ /* put ctrl to init on stop to end ongoing transmission */
+ priv->write_reg(priv, C_CAN_CTRL_REG, CONTROL_INIT);
+
/* deactivate pins */
pinctrl_pm_select_sleep_state(dev->dev.parent);
priv->can.state = CAN_STATE_STOPPED;
/* deactivate pins */
pinctrl_pm_select_sleep_state(dev->dev.parent);
priv->can.state = CAN_STATE_STOPPED;