---

yaml --- r: 190602 b: refs/heads/master c: 0c75ba2 h: refs/heads/master v: v3
git-mirror · Apr 30, 2010 · f560a22 · f560a22
1 parent c4016e7
commit f560a22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03f80cc3f24e1dcdbdba081ed5daf5575aac6180
+refs/heads/master: 0c75ba22541ccea88e89782373991109a7ec2a54
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/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);
 
+	if (!pdev->bus->self)
+		return;
+
 	pos = pci_pcie_cap(pdev->bus->self);
 	pci_read_config_word(pdev->bus->self, pos + PCI_EXP_LNKCTL, &reg16);
 	reg16 &= ~state;