From 3be488159031a79760b7b6ae82034c214033fb74 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 9 Feb 2007 16:05:12 +0000 Subject: [PATCH] --- yaml --- r: 47248 b: refs/heads/master c: 97210b5f1c2ca98c62663a38f1d32839031f1c27 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/spider_net.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6fe34f1d958d..84474bf79948 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9288f5c3f190ef5ee8e50b27e8ae1152f19061e4 +refs/heads/master: 97210b5f1c2ca98c62663a38f1d32839031f1c27 diff --git a/trunk/drivers/net/spider_net.c b/trunk/drivers/net/spider_net.c index bf6ff39e02bb..64ed8ff5b03a 100644 --- a/trunk/drivers/net/spider_net.c +++ b/trunk/drivers/net/spider_net.c @@ -1907,7 +1907,7 @@ spider_net_stop(struct net_device *netdev) spider_net_write_reg(card, SPIDER_NET_GHIINT2MSK, 0); /* free_irq(netdev->irq, netdev);*/ - free_irq(to_pci_dev(netdev->class_dev.dev)->irq, netdev); + free_irq(to_pci_dev(netdev->dev.parent)->irq, netdev); spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR, SPIDER_NET_DMA_TX_FEND_VALUE);