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

Commit ea82c246 authored by Stephane Grosjean's avatar Stephane Grosjean Committed by Greg Kroah-Hartman
Browse files

can: peak_usb: pcan_usb_fd_decode_status(): fix back to ERROR_ACTIVE state notification 

commit 3d031abc7e7249573148871180c28ecedb5e27df upstream.

This corrects the lack of notification of a return to ERROR_ACTIVE
state for USB - CANFD devices from PEAK-System.

Fixes: 0a25e1f4 ("can: peak_usb: add support for PEAK new CANFD USB adapters")
Link: https://lore.kernel.org/all/20210929142111.55757-1-s.grosjean@peak-system.com


Cc: stable@vger.kernel.org
Signed-off-by: default avatarStephane Grosjean <s.grosjean@peak-system.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c26dcd1c

drivers/net/can/usb/peak_usb/pcan_usb_fd.c

+2 −3
Original line number Diff line number Diff line
@@ -551,11 +551,10 @@ static int pcan_usb_fd_decode_status(struct pcan_usb_fd_if *usb_if, 
	} else if (sm->channel_p_w_b & PUCAN_BUS_WARNING) {

		new_state = CAN_STATE_ERROR_WARNING;

	} else {

		/* no error bit (so, no error skb, back to active state) */

		dev->can.state = CAN_STATE_ERROR_ACTIVE;

		/* back to (or still in) ERROR_ACTIVE state */

		new_state = CAN_STATE_ERROR_ACTIVE;

		pdev->bec.txerr = 0;

		pdev->bec.rxerr = 0;

		return 0;

	}



	/* state hasn't changed */