aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/micrel
diff options
context:
space:
mode:
authorMatt Renzelmann <mjr@cs.wisc.edu>2012-04-19 07:17:17 +0000
committerDavid S. Miller <davem@davemloft.net>2012-04-21 15:55:31 -0400
commite8195b24feb208f6e944e7542779f4397776794d (patch)
tree97e486ebadde763c721513e034966562570042e1 /drivers/net/ethernet/micrel
parentnet/hyperv: Adding cancellation to ensure rndis filter is closed (diff)
downloadlinux-dev-e8195b24feb208f6e944e7542779f4397776794d.tar.xz
linux-dev-e8195b24feb208f6e944e7542779f4397776794d.zip
ks8851: Fix request_irq/free_irq mismatch
The dev_id parameter passed to free_irq needs to match the one passed to the corresponding request_irq. Signed-off-by: Matt Renzelmann <mjr@cs.wisc.edu> Acked-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/micrel')
-rw-r--r--drivers/net/ethernet/micrel/ks8851.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index ad10759e3459..f8dda009d3c0 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -1525,7 +1525,7 @@ static int __devinit ks8851_probe(struct spi_device *spi)
err_netdev:
- free_irq(ndev->irq, ndev);
+ free_irq(ndev->irq, ks);
err_id:
err_irq: