From: Marc Kleine-Budde Date: Thu, 29 Sep 2022 07:58:30 +0000 (+0200) Subject: can: gs_usb: gs_can_open(): allow loopback and listen only at the same time X-Git-Tag: v6.2-rc1~99^2~369^2~4^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=deb8534e8ef3905b5a977486d11d4d36b4f94347;p=thirdparty%2Flinux.git can: gs_usb: gs_can_open(): allow loopback and listen only at the same time There's no reason why loopback and listen only should not be allowed at the same time. Replace the "else if" by "if" to reflect this in the code. Link: https://lore.kernel.org/all/20221019221016.1659260-2-mkl@pengutronix.de Signed-off-by: Marc Kleine-Budde --- diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c index 384847b4a4c95..aa6c84b7db066 100644 --- a/drivers/net/can/usb/gs_usb.c +++ b/drivers/net/can/usb/gs_usb.c @@ -911,7 +911,8 @@ static int gs_can_open(struct net_device *netdev) /* flags */ if (ctrlmode & CAN_CTRLMODE_LOOPBACK) flags |= GS_CAN_MODE_LOOP_BACK; - else if (ctrlmode & CAN_CTRLMODE_LISTENONLY) + + if (ctrlmode & CAN_CTRLMODE_LISTENONLY) flags |= GS_CAN_MODE_LISTEN_ONLY; /* Controller is not allowed to retry TX