projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pci-v4.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...
[linux-2.6-block.git]
/
drivers
/
net
/
ethernet
/
intel
/
fm10k
/
fm10k_pci.c
diff --git
a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index c859ababeed50e030baf7cb7041fbd20916c2265..02345d3813036cac695d675ae24b9a02aea8510c 100644
(file)
--- a/
drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/
drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@
-2440,8
+2440,6
@@
static pci_ers_result_t fm10k_io_slot_reset(struct pci_dev *pdev)
result = PCI_ERS_RESULT_RECOVERED;
}
- pci_cleanup_aer_uncorrect_error_status(pdev);
-
return result;
}