Skip to content

Commit 037ada7

Browse files
can: rockchip_canfd: rkcanfd_remove(): fix order of unregistration calls
If a driver is removed, the driver framework invokes the driver's remove callback. A CAN driver's remove function calls unregister_candev(), which calls net_device_ops::ndo_stop further down in the call stack for interfaces which are in the "up" state. The removal of the module causes a warning, as can_rx_offload_del() deletes the NAPI, while it is still active, because the interface is still up. To fix the warning, first unregister the network interface, which calls net_device_ops::ndo_stop, which disables the NAPI, and then call can_rx_offload_del(). Fixes: ff60bfb ("can: rockchip_canfd: add driver for Rockchip CAN-FD controller") Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20250502-can-rx-offload-del-v1-2-59a9b131589d@pengutronix.de Reviewed-by: Markus Schneider-Pargmann <msp@baylibre.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 parent 84f5eb8 commit 037ada7

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/net/can/rockchip/rockchip_canfd-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -937,8 +937,8 @@ static void rkcanfd_remove(struct platform_device *pdev)
937937
struct rkcanfd_priv *priv = platform_get_drvdata(pdev);
938938
struct net_device *ndev = priv->ndev;
939939

940-
can_rx_offload_del(&priv->offload);
941940
rkcanfd_unregister(priv);
941+
can_rx_offload_del(&priv->offload);
942942
free_candev(ndev);
943943
}
944944

0 commit comments

Comments
 (0)