]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: bcmgenet: Use correct dev_id for free_irq
authorFlorian Fainelli <f.fainelli@gmail.com>
Thu, 16 Jul 2015 22:51:15 +0000 (15:51 -0700)
committerLuis Henriques <luis.henriques@canonical.com>
Wed, 30 Sep 2015 12:20:37 +0000 (13:20 +0100)
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

index 4e615debe4729e2b103575fff027a2a491c661dd..201cee5419dc9ce3cae81abce4444c731da4708a 100644 (file)
@@ -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: