projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ethernet
/
qlogic
/
qlcnic
/
qlcnic_main.c
diff --git
a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index
96b947f
..
3beafc6
100644
(file)
--- a/
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@
-2690,6
+2690,7
@@
err_out_free_hw_res:
kfree(ahw);
err_out_free_res:
+ pci_disable_pcie_error_reporting(pdev);
pci_release_regions(pdev);
err_out_disable_pdev: