diff options
Diffstat (limited to 'drivers/net/forcedeth.c')
-rw-r--r-- | drivers/net/forcedeth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 3116601dbfea..3c340489804a 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -4004,7 +4004,7 @@ static int nv_request_irq(struct net_device *dev, int intr_test) | |||
4004 | /* Request irq for rx handling */ | 4004 | /* Request irq for rx handling */ |
4005 | sprintf(np->name_rx, "%s-rx", dev->name); | 4005 | sprintf(np->name_rx, "%s-rx", dev->name); |
4006 | if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector, | 4006 | if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector, |
4007 | &nv_nic_irq_rx, IRQF_SHARED, np->name_rx, dev) != 0) { | 4007 | nv_nic_irq_rx, IRQF_SHARED, np->name_rx, dev) != 0) { |
4008 | printk(KERN_INFO "forcedeth: request_irq failed for rx %d\n", ret); | 4008 | printk(KERN_INFO "forcedeth: request_irq failed for rx %d\n", ret); |
4009 | pci_disable_msix(np->pci_dev); | 4009 | pci_disable_msix(np->pci_dev); |
4010 | np->msi_flags &= ~NV_MSI_X_ENABLED; | 4010 | np->msi_flags &= ~NV_MSI_X_ENABLED; |
@@ -4013,7 +4013,7 @@ static int nv_request_irq(struct net_device *dev, int intr_test) | |||
4013 | /* Request irq for tx handling */ | 4013 | /* Request irq for tx handling */ |
4014 | sprintf(np->name_tx, "%s-tx", dev->name); | 4014 | sprintf(np->name_tx, "%s-tx", dev->name); |
4015 | if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector, | 4015 | if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector, |
4016 | &nv_nic_irq_tx, IRQF_SHARED, np->name_tx, dev) != 0) { | 4016 | nv_nic_irq_tx, IRQF_SHARED, np->name_tx, dev) != 0) { |
4017 | printk(KERN_INFO "forcedeth: request_irq failed for tx %d\n", ret); | 4017 | printk(KERN_INFO "forcedeth: request_irq failed for tx %d\n", ret); |
4018 | pci_disable_msix(np->pci_dev); | 4018 | pci_disable_msix(np->pci_dev); |
4019 | np->msi_flags &= ~NV_MSI_X_ENABLED; | 4019 | np->msi_flags &= ~NV_MSI_X_ENABLED; |
@@ -4022,7 +4022,7 @@ static int nv_request_irq(struct net_device *dev, int intr_test) | |||
4022 | /* Request irq for link and timer handling */ | 4022 | /* Request irq for link and timer handling */ |
4023 | sprintf(np->name_other, "%s-other", dev->name); | 4023 | sprintf(np->name_other, "%s-other", dev->name); |
4024 | if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector, | 4024 | if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector, |
4025 | &nv_nic_irq_other, IRQF_SHARED, np->name_other, dev) != 0) { | 4025 | nv_nic_irq_other, IRQF_SHARED, np->name_other, dev) != 0) { |
4026 | printk(KERN_INFO "forcedeth: request_irq failed for link %d\n", ret); | 4026 | printk(KERN_INFO "forcedeth: request_irq failed for link %d\n", ret); |
4027 | pci_disable_msix(np->pci_dev); | 4027 | pci_disable_msix(np->pci_dev); |
4028 | np->msi_flags &= ~NV_MSI_X_ENABLED; | 4028 | np->msi_flags &= ~NV_MSI_X_ENABLED; |