From c6a4a6db087d8f4d83308360e6d70b3b40925754 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 31 Mar 2008 01:41:01 +0300
Subject: [PATCH] --- yaml --- r: 91691 b: refs/heads/master c:
 d75b305295c38ba9610ff3b2200f7d1989dc55fd h: refs/heads/master i:   91689:
 3d7fa254f79be3e1fe941af0e5097169ab26f93b   91687:
 a55b2a2396997de1ab130b7891a74c39fcb2dd48 v: v3

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

diff --git a/[refs] b/[refs]
index 6801bd0c13cb..db92e0958a8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc043274560f398225dad7f0e24c6a7610d3c08a
+refs/heads/master: d75b305295c38ba9610ff3b2200f7d1989dc55fd
diff --git a/trunk/drivers/pci/pcie/aer/aerdrv_acpi.c b/trunk/drivers/pci/pcie/aer/aerdrv_acpi.c
index 7e53fa590cf2..96ac54072f6f 100644
--- a/trunk/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/trunk/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -37,7 +37,7 @@ int aer_osc_setup(struct pcie_device *pciedev)
 		return -1;
 
 	/* Find root host bridge */
-	while (pdev->bus && pdev->bus->self)
+	while (pdev->bus->self)
 		pdev = pdev->bus->self;
 	handle = acpi_get_pci_rootbridge_handle(
 		pci_domain_nr(pdev->bus), pdev->bus->number);