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

Commit ca794089 authored by Marek Vasut's avatar Marek Vasut Committed by Marc Kleine-Budde
Browse files

can: ifi: Treat CAN_CTRLMODE_FD_NON_ISO correctly 



The CAN_CTRLMODE_FD flag is set for both ISO and BOSCH CANFD mode,
while the CAN_CTRLMODE_FD_NON_ISO is additional flag which is only
set for CANFD-BOSCH mode. Fix the handling of the flags to reflect
this.

Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Reviewed-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 478ad12c

drivers/net/can/ifi_canfd/ifi_canfd.c

+3 −2
Original line number Diff line number Diff line
@@ -644,10 +644,11 @@ static void ifi_canfd_start(struct net_device *ndev) 
	if (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK)

		stcmd |= IFI_CANFD_STCMD_LOOPBACK;



	if (priv->can.ctrlmode & CAN_CTRLMODE_FD)

	if ((priv->can.ctrlmode & CAN_CTRLMODE_FD) &&

	    !(priv->can.ctrlmode & CAN_CTRLMODE_FD_NON_ISO))

		stcmd |= IFI_CANFD_STCMD_ENABLE_ISO;



	if (!(priv->can.ctrlmode & (CAN_CTRLMODE_FD | CAN_CTRLMODE_FD_NON_ISO)))

	if (!(priv->can.ctrlmode & CAN_CTRLMODE_FD))

		stcmd |= IFI_CANFD_STCMD_DISABLE_CANFD;



	priv->can.state = CAN_STATE_ERROR_ACTIVE;