lkml.org 
[lkml]   [2020]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 040/142] net: microchip: encx24j600: add missed kthread_stop
    Date
    From: Chuhong Yuan <hslester96@gmail.com>

    [ 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>
    ---
    drivers/net/ethernet/microchip/encx24j600.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/microchip/encx24j600.c b/drivers/net/ethernet/microchip/encx24j600.c
    index 52c41d11f565..c3a6edc0ddf6 100644
    --- a/drivers/net/ethernet/microchip/encx24j600.c
    +++ b/drivers/net/ethernet/microchip/encx24j600.c
    @@ -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);

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-01 20:50    [W:4.014 / U:0.536 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site