diff options
Diffstat (limited to 'drivers/net/myri10ge/myri10ge.c')
-rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 1a2b9785e998..5a74f63618bc 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
@@ -2251,12 +2251,6 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp) | |||
2251 | } | 2251 | } |
2252 | 2252 | ||
2253 | cap = pci_find_ext_capability(bridge, PCI_EXT_CAP_ID_ERR); | 2253 | cap = pci_find_ext_capability(bridge, PCI_EXT_CAP_ID_ERR); |
2254 | /* nvidia ext cap is not always linked in ext cap chain */ | ||
2255 | if (!cap | ||
2256 | && bridge->vendor == PCI_VENDOR_ID_NVIDIA | ||
2257 | && bridge->device == PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_PCIE) | ||
2258 | cap = 0x160; | ||
2259 | |||
2260 | if (!cap) | 2254 | if (!cap) |
2261 | return; | 2255 | return; |
2262 | 2256 | ||
@@ -2732,8 +2726,6 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2732 | /* Save configuration space to be restored if the | 2726 | /* Save configuration space to be restored if the |
2733 | * nic resets due to a parity error */ | 2727 | * nic resets due to a parity error */ |
2734 | myri10ge_save_state(mgp); | 2728 | myri10ge_save_state(mgp); |
2735 | /* Restore state immediately since pci_save_msi_state disables MSI */ | ||
2736 | myri10ge_restore_state(mgp); | ||
2737 | 2729 | ||
2738 | /* Setup the watchdog timer */ | 2730 | /* Setup the watchdog timer */ |
2739 | setup_timer(&mgp->watchdog_timer, myri10ge_watchdog_timer, | 2731 | setup_timer(&mgp->watchdog_timer, myri10ge_watchdog_timer, |