lkml.org 
[lkml]   [2015]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 089/133] net: bcmgenet: Use correct dev_id for free_irq
    Date
    3.16.7-ckt18 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Florian Fainelli <f.fainelli@gmail.com>

    commit 978ffac4189e8bb7e74bce6463e501a7b92555af upstream.

    bcmgenet_open()'s error path call free_irq() with a dev_id argument
    different from the one we used to call request_irq() with, this will
    make us trip over the warning in kernel/irq/manage.c:__free_irq()

    Fixes: 1c1008c793fa4 ("net: bcmgenet: add main driver file")
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
    index 4e615debe472..201cee5419dc 100644
    --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
    +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
    @@ -2060,7 +2060,7 @@ static int bcmgenet_open(struct net_device *dev)
    return 0;

    err_irq0:
    - free_irq(priv->irq0, dev);
    + free_irq(priv->irq0, priv);
    err_fini_dma:
    bcmgenet_fini_dma(priv);
    err_clk_disable:

    \
     
     \ /
      Last update: 2015-09-30 12:41    [W:4.127 / U:1.748 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site