| Message ID | 1564061598-4440-1-git-send-email-claudiu.manoil@nxp.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] ocelot: Cancel delayed work before wq destruction | expand |
On 25/07/2019 16:33:18+0300, Claudiu Manoil wrote: > Make sure the delayed work for stats update is not pending before > wq destruction. > This fixes the module unload path. > The issue is there since day 1. > > Fixes: a556c76adc05 ("net: mscc: Add initial Ocelot switch support") > > Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com> Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > --- > drivers/net/ethernet/mscc/ocelot.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c > index b71e4ecbe469..6932e615d4b0 100644 > --- a/drivers/net/ethernet/mscc/ocelot.c > +++ b/drivers/net/ethernet/mscc/ocelot.c > @@ -1818,6 +1818,7 @@ EXPORT_SYMBOL(ocelot_init); > > void ocelot_deinit(struct ocelot *ocelot) > { > + cancel_delayed_work(&ocelot->stats_work); > destroy_workqueue(ocelot->stats_queue); > mutex_destroy(&ocelot->stats_lock); > ocelot_ace_deinit(); > -- > 2.17.1 >
From: Claudiu Manoil <claudiu.manoil@nxp.com> Date: Thu, 25 Jul 2019 16:33:18 +0300 > Make sure the delayed work for stats update is not pending before > wq destruction. > This fixes the module unload path. > The issue is there since day 1. > > Fixes: a556c76adc05 ("net: mscc: Add initial Ocelot switch support") > > Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com> Applied, thanks.
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c index b71e4ecbe469..6932e615d4b0 100644 --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c @@ -1818,6 +1818,7 @@ EXPORT_SYMBOL(ocelot_init); void ocelot_deinit(struct ocelot *ocelot) { + cancel_delayed_work(&ocelot->stats_work); destroy_workqueue(ocelot->stats_queue); mutex_destroy(&ocelot->stats_lock); ocelot_ace_deinit();
Make sure the delayed work for stats update is not pending before wq destruction. This fixes the module unload path. The issue is there since day 1. Fixes: a556c76adc05 ("net: mscc: Add initial Ocelot switch support") Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com> --- drivers/net/ethernet/mscc/ocelot.c | 1 + 1 file changed, 1 insertion(+)