From: Viktor Babrian <babrian.viktor@renyi.mta.hu>
Date: Sun, 18 Jan 2015 19:01:40 +0000 (+0100)
Subject: can: c_can: end pending transmission on network stop (ifdown)
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7ffd7b4e169d619e66928fe5d997723f2c6f1056;p=deliverable%2Flinux.git

can: c_can: end pending transmission on network stop (ifdown)

Put controller into init mode in network stop to end pending transmissions. The
issue is observed in cases when transmitted frame is not acked.

Signed-off-by: Viktor Babrian <babrian.viktor@renyi.mta.hu>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---

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;