From ce6b695bb4612a405ce69d262780f6b19b4310c9 Mon Sep 17 00:00:00 2001
From: Alex Chiang <achiang@hp.com>
Date: Thu, 5 Mar 2009 19:28:40 -0700
Subject: [PATCH] --- yaml --- r: 132234 b: refs/heads/master c:
 cb4cb4ac7338c28b047760be187355ed9c783e72 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/pci/pcie/aer/aerdrv_core.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c788d98f036d..4dd1ed1f318a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 649426efcfbc67a8b033497151816cbac9fd0cfa
+refs/heads/master: cb4cb4ac7338c28b047760be187355ed9c783e72
diff --git a/trunk/drivers/pci/pcie/aer/aerdrv_core.c b/trunk/drivers/pci/pcie/aer/aerdrv_core.c
index d0c973685868..382575007382 100644
--- a/trunk/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/trunk/drivers/pci/pcie/aer/aerdrv_core.c
@@ -133,6 +133,9 @@ static void set_downstream_devices_error_reporting(struct pci_dev *dev,
 						   bool enable)
 {
 	set_device_error_reporting(dev, &enable);
+
+	if (!dev->subordinate)
+		return;
 	pci_walk_bus(dev->subordinate, set_device_error_reporting, &enable);
 }