]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
can: rockchip_canfd: rkcanfd_remove(): fix order of unregistration calls
authorMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 2 May 2025 14:13:45 +0000 (16:13 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Tue, 6 May 2025 13:54:04 +0000 (15:54 +0200)
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: ff60bfbaf67f ("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>
drivers/net/can/rockchip/rockchip_canfd-core.c

index 7107a37da36c7fe9d7da5d699d9c6b2238d6c510..c3fb3176ce4221d1334623933aade179f13c1f21 100644 (file)
@@ -937,8 +937,8 @@ static void rkcanfd_remove(struct platform_device *pdev)
        struct rkcanfd_priv *priv = platform_get_drvdata(pdev);
        struct net_device *ndev = priv->ndev;
 
-       can_rx_offload_del(&priv->offload);
        rkcanfd_unregister(priv);
+       can_rx_offload_del(&priv->offload);
        free_candev(ndev);
 }