From f560a222fe76b5c87dabcaf33920c56bc68698fd Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Wed, 28 Apr 2010 21:46:06 +0000
Subject: [PATCH] --- yaml --- r: 190602 b: refs/heads/master c:
 0c75ba22541ccea88e89782373991109a7ec2a54 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/e1000e/netdev.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 27539a14a4ed..099f9cb6ca98 100644
--- 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
index fb8fc7d1b50d..dbf81788bb40 100644
--- 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;