lkml.org 
[lkml]   [2020]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 24/49] net: moxa: Fix a potential double 'free_irq()'
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit ee8d2267f0e39a1bfd95532da3a6405004114b27 ]

    Should an irq requested with 'devm_request_irq' be released explicitly,
    it should be done by 'devm_free_irq()', not 'free_irq()'.

    Fixes: 6c821bd9edc9 ("net: Add MOXA ART SoCs ethernet driver")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/moxa/moxart_ether.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c
    index e1651756bf9da..f70bb81e1ed65 100644
    --- a/drivers/net/ethernet/moxa/moxart_ether.c
    +++ b/drivers/net/ethernet/moxa/moxart_ether.c
    @@ -564,7 +564,7 @@ static int moxart_remove(struct platform_device *pdev)
    struct net_device *ndev = platform_get_drvdata(pdev);

    unregister_netdev(ndev);
    - free_irq(ndev->irq, ndev);
    + devm_free_irq(&pdev->dev, ndev->irq, ndev);
    moxart_mac_free_memory(ndev);
    free_netdev(ndev);

    --
    2.20.1
    \
     
     \ /
      Last update: 2020-05-14 20:54    [W:2.123 / U:0.728 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site