Quoting Sasha Levin (2015-04-23 19:00:35) > From: Andri Yngvason <[email protected]> > > This patch has been added to the 3.18 stable tree. If you have any > objections, please let us know. > > =============== > > [ Upstream commit 258ce80e19211f06c97a562a71308ec21a9ab98f ] > > Making sure that the bus-off state gets passed to can_change_state(). > > Signed-off-by: Andri Yngvason <[email protected]> > Cc: linux-stable <[email protected]> > Signed-off-by: Marc Kleine-Budde <[email protected]> > Signed-off-by: Sasha Levin <[email protected]> > --- > drivers/net/can/flexcan.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c > index 60f86bd..f255037 100644 > --- a/drivers/net/can/flexcan.c > +++ b/drivers/net/can/flexcan.c > @@ -665,10 +665,10 @@ static int flexcan_poll_state(struct net_device *dev, > u32 reg_esr) > new_state = CAN_STATE_ERROR_ACTIVE; > else > new_state = CAN_STATE_ERROR_WARNING; > - } else if (unlikely(flt == FLEXCAN_ESR_FLT_CONF_PASSIVE)) > - new_state = CAN_STATE_ERROR_PASSIVE; > - else > - new_state = CAN_STATE_BUS_OFF; > + } else { > + new_state = flt == FLEXCAN_ESR_FLT_CONF_PASSIVE ? > + CAN_STATE_ERROR_PASSIVE : CAN_STATE_BUS_OFF; > + } > > /* state hasn't changed */ > if (likely(new_state == priv->can.state)) > -- > 2.1.0
This is not needed. This bug was introduced in 3.19. Best regards, Andri -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
