]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
net: microchip: encx24j600: add missed kthread_stop
authorChuhong Yuan <hslester96@gmail.com>
Thu, 7 May 2020 15:13:20 +0000 (23:13 +0800)
committerMarcelo Henrique Cerri <marcelo.cerri@canonical.com>
Mon, 22 Jun 2020 20:23:10 +0000 (17:23 -0300)
BugLink: https://bugs.launchpad.net/bugs/1881927
[ Upstream commit ff8ce319e9c25e920d994cc35236f0bb32dfc8f3 ]

This driver calls kthread_run() in probe, but forgets to call
kthread_stop() in probe failure and remove.
Add the missed kthread_stop() to fix it.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/net/ethernet/microchip/encx24j600.c

index 52c41d11f56560b7dc2b8eaacdc7599e2759a48a..c3a6edc0ddf62ae2b2ee44b36cf3f430a0c92d78 100644 (file)
@@ -1070,7 +1070,7 @@ static int encx24j600_spi_probe(struct spi_device *spi)
        if (unlikely(ret)) {
                netif_err(priv, probe, ndev, "Error %d initializing card encx24j600 card\n",
                          ret);
-               goto out_free;
+               goto out_stop;
        }
 
        eidled = encx24j600_read_reg(priv, EIDLED);
@@ -1088,6 +1088,8 @@ static int encx24j600_spi_probe(struct spi_device *spi)
 
 out_unregister:
        unregister_netdev(priv->ndev);
+out_stop:
+       kthread_stop(priv->kworker_task);
 out_free:
        free_netdev(ndev);
 
@@ -1100,6 +1102,7 @@ static int encx24j600_spi_remove(struct spi_device *spi)
        struct encx24j600_priv *priv = dev_get_drvdata(&spi->dev);
 
        unregister_netdev(priv->ndev);
+       kthread_stop(priv->kworker_task);
 
        free_netdev(priv->ndev);