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

Commit bc03a541 authored by Alexander Stein's avatar Alexander Stein Committed by Marc Kleine-Budde
Browse files

can: flexcan: Disable error interrupt when bus error reporting is disabled 



In case we don't have FLEXCAN_HAS_BROKEN_ERR_STATE and the user set
CAN_CTRLMODE_BERR_REPORTING once it can not be unset again until reboot.
So in case neither hardware nor user wants the error interrupt disable
the bit.

Signed-off-by: default avatarAlexander Stein <alexander.stein@systec-electronic.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 37b75a3a

drivers/net/can/flexcan.c

+2 −0
Original line number Diff line number Diff line
@@ -852,6 +852,8 @@ static int flexcan_chip_start(struct net_device *dev) 
	if (priv->devtype_data->features & FLEXCAN_HAS_BROKEN_ERR_STATE ||

	    priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING)

		reg_ctrl |= FLEXCAN_CTRL_ERR_MSK;

	else

		reg_ctrl &= ~FLEXCAN_CTRL_ERR_MSK;



	/* save for later use */

	priv->reg_ctrl_default = reg_ctrl;