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
/
netxen
/
netxen_nic_main.c
diff --git
a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index
7e6bac8
..
344ea11
100644
(file)
--- a/
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@
-1602,6
+1602,8
@@
err_out_free_netdev:
free_netdev(netdev);
err_out_free_res:
+ if (NX_IS_REVISION_P3(pdev->revision))
+ pci_disable_pcie_error_reporting(pdev);
pci_release_regions(pdev);
err_out_disable_pdev: