Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 258ce80e authored by Andri Yngvason's avatar Andri Yngvason Committed by Marc Kleine-Budde
Browse files

can: flexcan: fix bus-off error state handling. 



Making sure that the bus-off state gets passed to can_change_state().

Signed-off-by: default avatarAndri Yngvason <andri.yngvason@marel.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 0f251e45

drivers/net/can/flexcan.c

+3 −4
Original line number Diff line number Diff line
@@ -592,13 +592,12 @@ static int flexcan_poll_state(struct net_device *dev, u32 reg_esr) 
		rx_state = unlikely(reg_esr & FLEXCAN_ESR_RX_WRN) ?

			   CAN_STATE_ERROR_WARNING : CAN_STATE_ERROR_ACTIVE;

		new_state = max(tx_state, rx_state);

	} else if (unlikely(flt == FLEXCAN_ESR_FLT_CONF_PASSIVE)) {

	} else {

		__flexcan_get_berr_counter(dev, &bec);

		new_state = CAN_STATE_ERROR_PASSIVE;

		new_state = flt == FLEXCAN_ESR_FLT_CONF_PASSIVE ?

			    CAN_STATE_ERROR_PASSIVE : CAN_STATE_BUS_OFF;

		rx_state = bec.rxerr >= bec.txerr ? new_state : 0;

		tx_state = bec.rxerr <= bec.txerr ? new_state : 0;

	} else {

		new_state = CAN_STATE_BUS_OFF;

	}



	/* state hasn't changed */