aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2015-07-16 15:51:15 -0700
committerDavid S. Miller <davem@davemloft.net>2015-07-20 20:48:14 -0700
commit978ffac4189e8bb7e74bce6463e501a7b92555af (patch)
tree98c1e4f54b8e5eeff95d1f998a7efe0c9a0f1d5d /drivers/net/ethernet
parentnet: bcmgenet: Remove excessive PHY reset (diff)
downloadlinux-dev-978ffac4189e8bb7e74bce6463e501a7b92555af.tar.xz
linux-dev-978ffac4189e8bb7e74bce6463e501a7b92555af.zip
net: bcmgenet: Use correct dev_id for free_irq
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>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/broadcom/genet/bcmgenet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 674f374dceee..c634ddbbd21d 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -2695,7 +2695,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: