4.13-stable review patch. If anyone has any objections, please let me know.
------------------ From: ZHU Yi (ST-FIR/ENG1-Zhu) <yi.z...@cn.bosch.com> commit ad2302345d59d29232cb668baaae9e840925d153 upstream. 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.z...@cn.bosch.com> Signed-off-by: Mark Jonas <mark.jo...@de.bosch.com> Acked-by: Wolfgang Grandegger <w...@grandegger.com> Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- drivers/net/can/flexcan.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -765,8 +765,9 @@ static irqreturn_t flexcan_irq(int irq, flexcan_write(reg_esr & FLEXCAN_ESR_ALL_INT, ®s->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 */