Patch "can: m_can: Remove repeated check for is_peripheral" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    can: m_can: Remove repeated check for is_peripheral

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     can-m_can-remove-repeated-check-for-is_peripheral.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit e5693bb2ddf64f4b4b37fc147a2a2cb64a637eb1
Author: Markus Schneider-Pargmann <msp@xxxxxxxxxxxx>
Date:   Wed Mar 15 12:05:31 2023 +0100

    can: m_can: Remove repeated check for is_peripheral
    
    [ Upstream commit 73042934e4a30d9f45ff9cb0b3b029a01dbe7130 ]
    
    Merge both if-blocks to fix this.
    
    Signed-off-by: Markus Schneider-Pargmann <msp@xxxxxxxxxxxx>
    Reviewed-by: Simon Horman <simon.horman@xxxxxxxxxxxx>
    Link: https://lore.kernel.org/all/20230315110546.2518305-2-msp@xxxxxxxxxxxx
    Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
    Stable-dep-of: 801ad2f87b0c ("can: m_can: enable NAPI before enabling interrupts")
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index 561f25cdad3fb..ead8321ed3bfc 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -1566,10 +1566,8 @@ static int m_can_close(struct net_device *dev)
 		cdev->tx_skb = NULL;
 		destroy_workqueue(cdev->tx_wq);
 		cdev->tx_wq = NULL;
-	}
-
-	if (cdev->is_peripheral)
 		can_rx_offload_disable(&cdev->offload);
+	}
 
 	close_candev(dev);