summaryrefslogtreecommitdiff
path: root/drivers/net/can/cc770
diff options
context:
space:
mode:
authorAndri Yngvason <andri.yngvason@marel.com>2015-01-16 14:30:28 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2015-01-20 13:56:53 +0100
commitbe38a6f9f4093b0f1fa9e7d8cb47d588bc117c21 (patch)
tree41a834156d6483c55fa28eccfc208449bff67d95 /drivers/net/can/cc770
parent0c49087462e8587c12ecfeaf1dd46fdc0ddc4532 (diff)
can: move can_stats.bus_off++ from can_bus_off into can_change_state
In order to be able to move the stats increment from can_bus_off() into can_change_state(), the increment had to be moved back into code that was using can_bus_off() but not can_change_state(). As a side-effect, this patch fixes the following bugs: * Redundant call to can_bus_off() in c_can. * Bus-off counted twice in xilinx_can. Signed-off-by: Andri Yngvason <andri.yngvason@marel.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/cc770')
-rw-r--r--drivers/net/can/cc770/cc770.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/can/cc770/cc770.c b/drivers/net/can/cc770/cc770.c
index c486fe510f37..c11d44984036 100644
--- a/drivers/net/can/cc770/cc770.c
+++ b/drivers/net/can/cc770/cc770.c
@@ -535,6 +535,7 @@ static int cc770_err(struct net_device *dev, u8 status)
cc770_write_reg(priv, control, CTRL_INI);
cf->can_id |= CAN_ERR_BUSOFF;
priv->can.state = CAN_STATE_BUS_OFF;
+ priv->can.can_stats.bus_off++;
can_bus_off(dev);
} else if (status & STAT_WARN) {
cf->can_id |= CAN_ERR_CRTL;