Skip to content

Commit 9e79ce6

Browse files
committed
Merge tag 'linux-can-fixes-for-3.19-20150121' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says: ==================== pull-request: can 2015-01-21 this is a pull request for v3.19, net/master, which consists of a single patch. Viktor Babrian fixes the issue in the c_can dirver, that the CAN interface might continue to send frames after the interface has been shut down. ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 03a6058 + 7ffd7b4 commit 9e79ce6

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/net/can/c_can/c_can.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -615,6 +615,9 @@ static void c_can_stop(struct net_device *dev)
615615

616616
c_can_irq_control(priv, false);
617617

618+
/* put ctrl to init on stop to end ongoing transmission */
619+
priv->write_reg(priv, C_CAN_CTRL_REG, CONTROL_INIT);
620+
618621
/* deactivate pins */
619622
pinctrl_pm_select_sleep_state(dev->dev.parent);
620623
priv->can.state = CAN_STATE_STOPPED;

0 commit comments

Comments
 (0)