diff options
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/nvidia/forcedeth.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index 8561dd25db66..84952b308f83 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c | |||
@@ -3943,13 +3943,11 @@ static int nv_request_irq(struct net_device *dev, int intr_test) | |||
3943 | ret = pci_enable_msi(np->pci_dev); | 3943 | ret = pci_enable_msi(np->pci_dev); |
3944 | if (ret == 0) { | 3944 | if (ret == 0) { |
3945 | np->msi_flags |= NV_MSI_ENABLED; | 3945 | np->msi_flags |= NV_MSI_ENABLED; |
3946 | dev->irq = np->pci_dev->irq; | ||
3947 | if (request_irq(np->pci_dev->irq, handler, IRQF_SHARED, dev->name, dev) != 0) { | 3946 | if (request_irq(np->pci_dev->irq, handler, IRQF_SHARED, dev->name, dev) != 0) { |
3948 | netdev_info(dev, "request_irq failed %d\n", | 3947 | netdev_info(dev, "request_irq failed %d\n", |
3949 | ret); | 3948 | ret); |
3950 | pci_disable_msi(np->pci_dev); | 3949 | pci_disable_msi(np->pci_dev); |
3951 | np->msi_flags &= ~NV_MSI_ENABLED; | 3950 | np->msi_flags &= ~NV_MSI_ENABLED; |
3952 | dev->irq = np->pci_dev->irq; | ||
3953 | goto out_err; | 3951 | goto out_err; |
3954 | } | 3952 | } |
3955 | 3953 | ||
@@ -5650,9 +5648,6 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
5650 | np->base = ioremap(addr, np->register_size); | 5648 | np->base = ioremap(addr, np->register_size); |
5651 | if (!np->base) | 5649 | if (!np->base) |
5652 | goto out_relreg; | 5650 | goto out_relreg; |
5653 | dev->base_addr = (unsigned long)np->base; | ||
5654 | |||
5655 | dev->irq = pci_dev->irq; | ||
5656 | 5651 | ||
5657 | np->rx_ring_size = RX_RING_DEFAULT; | 5652 | np->rx_ring_size = RX_RING_DEFAULT; |
5658 | np->tx_ring_size = TX_RING_DEFAULT; | 5653 | np->tx_ring_size = TX_RING_DEFAULT; |