summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorZHU Yi (ST-FIR/ENG1-Zhu) <Yi.Zhu5@cn.bosch.com>2017-09-15 09:59:15 +0300
committerMarc Kleine-Budde <mkl@pengutronix.de>2017-10-19 14:05:53 +0300
commitad2302345d59d29232cb668baaae9e840925d153 (patch)
tree997cbacc08320845055fb53cf267f3bbfd135fcd /drivers/net
parent28e33f9d78eefe98ea86673ab31e988b37a9a738 (diff)
downloadlinux-ad2302345d59d29232cb668baaae9e840925d153.tar.xz
can: flexcan: fix state transition regression
Update state upon any interrupt to report correct state transitions in case the flexcan core enabled the broken error state quirk fix. Signed-off-by: Zhu Yi <yi.zhu5@cn.bosch.com> Signed-off-by: Mark Jonas <mark.jonas@de.bosch.com> Acked-by: Wolfgang Grandegger <wg@grandegger.com> Cc: linux-stable <stable@vger.kernel.org> # >= v4.11 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/can/flexcan.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 13f0f219d8aa..df4bfb83024c 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -765,8 +765,9 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)
flexcan_write(reg_esr & FLEXCAN_ESR_ALL_INT, &regs->esr);
}
- /* state change interrupt */
- if (reg_esr & FLEXCAN_ESR_ERR_STATE)
+ /* state change interrupt or broken error state quirk fix is enabled */
+ if ((reg_esr & FLEXCAN_ESR_ERR_STATE) ||
+ (priv->devtype_data->quirks & FLEXCAN_QUIRK_BROKEN_ERR_STATE))
flexcan_irq_state(dev, reg_esr);
/* bus error IRQ - handle if bus error reporting is activated */