projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a57915a
)
can: m_can: Remove repeated check for is_peripheral
author
Markus Schneider-Pargmann
<msp@baylibre.com>
Wed, 15 Mar 2023 11:05:31 +0000
(12:05 +0100)
committer
Marc Kleine-Budde
<mkl@pengutronix.de>
Fri, 24 Mar 2023 18:13:53 +0000
(19:13 +0100)
Merge both if-blocks to fix this.
Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Link:
https://lore.kernel.org/all/20230315110546.2518305-2-msp@baylibre.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/m_can/m_can.c
patch
|
blob
|
history
diff --git
a/drivers/net/can/m_can/m_can.c
b/drivers/net/can/m_can/m_can.c
index 8e83d6963d853b448535adb7a553d95613fbf280..563625a701fca9773e218e1ff45c067b4978dc12 100644
(file)
--- a/
drivers/net/can/m_can/m_can.c
+++ b/
drivers/net/can/m_can/m_can.c
@@
-1592,10
+1592,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);