git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
e1000e: Fix oops caused by ASPM patch.
[safe/jmp/linux-2.6]
/
drivers
/
net
/
e1000e
/
netdev.c
diff --git
a/drivers/net/e1000e/netdev.c
b/drivers/net/e1000e/netdev.c
index
fb8fc7d
..
dbf8178
100644
(file)
--- a/
drivers/net/e1000e/netdev.c
+++ b/
drivers/net/e1000e/netdev.c
@@
-4633,6
+4633,9
@@
static void __e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
reg16 &= ~state;
pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, reg16);
reg16 &= ~state;
pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, reg16);
+ if (!pdev->bus->self)
+ return;
+
pos = pci_pcie_cap(pdev->bus->self);
pci_read_config_word(pdev->bus->self, pos + PCI_EXP_LNKCTL, ®16);
reg16 &= ~state;
pos = pci_pcie_cap(pdev->bus->self);
pci_read_config_word(pdev->bus->self, pos + PCI_EXP_LNKCTL, ®16);
reg16 &= ~state;