From 680569b8440950d8c8428fc81b25c983021bc678 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 19 Jun 2012 07:35:34 -0600
Subject: [PATCH] --- yaml --- r: 316491 b: refs/heads/master c:
 8291550f8479fde2cee571d1b367e6918819f189 h: refs/heads/master i:   316489:
 775d46c6ece1acc7c67723c61d100d288e3fb40d   316487:
 1b2ec691507c3f452679cb64a1e8a6598ec09486 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/pci/pci.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ed27f0103d20..b2dd4fe16005 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6d88c832eaea6c6947ddf7b664601930a9f8a14
+refs/heads/master: 8291550f8479fde2cee571d1b367e6918819f189
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 8f4a5ea543fc..b9e93cf1eb40 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -2108,7 +2108,7 @@ int pci_enable_obff(struct pci_dev *dev, enum pci_obff_signal_type type)
 		return -ENOTSUPP; /* no OBFF support at all */
 
 	/* Make sure the topology supports OBFF as well */
-	if (dev->bus) {
+	if (dev->bus->self) {
 		ret = pci_enable_obff(dev->bus->self, type);
 		if (ret)
 			return ret;
@@ -2215,7 +2215,7 @@ int pci_enable_ltr(struct pci_dev *dev)
 		return -EINVAL;
 
 	/* Enable upstream ports first */
-	if (dev->bus) {
+	if (dev->bus->self) {
 		ret = pci_enable_ltr(dev->bus->self);
 		if (ret)
 			return ret;