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

Commit d70dd845 authored by Wu Bo's avatar Wu Bo Committed by Greg Kroah-Hartman
Browse files

can: m_can: m_can_handle_state_change(): fix state change 



[ Upstream commit cd0d83eab2e0c26fe87a10debfedbb23901853c1 ]

m_can_handle_state_change() is called with the new_state as an argument.

In the switch statements for CAN_STATE_ERROR_ACTIVE, the comment and the
following code indicate that a CAN_STATE_ERROR_WARNING is handled.

This patch fixes this problem by changing the case to CAN_STATE_ERROR_WARNING.

Signed-off-by: default avatarWu Bo <wubo.oduw@gmail.com>
Link: http://lore.kernel.org/r/20200129022330.21248-2-wubo.oduw@gmail.com


Cc: Dan Murphy <dmurphy@ti.com>
Fixes: e0d1f481 ("can: m_can: add Bosch M_CAN controller support")
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c503b128

drivers/net/can/m_can/m_can.c

+2 −2
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ static int m_can_handle_state_change(struct net_device *dev, 
	unsigned int ecr;



	switch (new_state) {

	case CAN_STATE_ERROR_ACTIVE:

	case CAN_STATE_ERROR_WARNING:

		/* error warning state */

		priv->can.can_stats.error_warning++;

		priv->can.state = CAN_STATE_ERROR_WARNING;
@@ -601,7 +601,7 @@ static int m_can_handle_state_change(struct net_device *dev, 
	__m_can_get_berr_counter(dev, &bec);



	switch (new_state) {

	case CAN_STATE_ERROR_ACTIVE:

	case CAN_STATE_ERROR_WARNING:

		/* error warning state */

		cf->can_id |= CAN_ERR_CRTL;

		cf->data[1] = (bec.txerr > bec.rxerr) ?