diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-27 02:24:14 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-27 02:24:14 +0300 |
| commit | 9e79ce66c6e930e815e1d3ad3b875b56dbe99c46 (patch) | |
| tree | ff8e5bb8624008689b5c850696586aa0675475fc /drivers | |
| parent | 03a605804bc4521ff2dfee17090eb12582936402 (diff) | |
| parent | 7ffd7b4e169d619e66928fe5d997723f2c6f1056 (diff) | |
| download | linux-9e79ce66c6e930e815e1d3ad3b875b56dbe99c46.tar.xz | |
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 <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/can/c_can/c_can.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index f94a9fa60488..c672c4dcffac 100644 --- 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); + /* 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; |