From 3ca9ededc0f9212f554c783bfb81eb00122cbbef Mon Sep 17 00:00:00 2001
From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date: Wed, 22 Oct 2008 14:30:15 +0900
Subject: [PATCH] --- yaml --- r: 117227 b: refs/heads/master c:
 b84346ef74cf76793070762b933387729c5df1ed h: refs/heads/master i:   117225:
 4c78b4cfd1c430e1d2d0b243281cfb3f19f71ff3   117223:
 8d2570c95cd331f7cbb0ee4bfb4ac0a9d519dc62 v: v3

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

diff --git a/[refs] b/[refs]
index a568e8d001ae..8a928735cc11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1c19894b786f10c76ac40e93c6b5d70c9b946d2
+refs/heads/master: b84346ef74cf76793070762b933387729c5df1ed
diff --git a/trunk/drivers/pci/hotplug/pciehp_hpc.c b/trunk/drivers/pci/hotplug/pciehp_hpc.c
index 4c74d536d45c..4b921226f888 100644
--- a/trunk/drivers/pci/hotplug/pciehp_hpc.c
+++ b/trunk/drivers/pci/hotplug/pciehp_hpc.c
@@ -1147,11 +1147,11 @@ struct controller *pcie_init(struct pcie_device *dev)
 	if (!ctrl->cap_base) {
 		ctrl_err(ctrl, "%s: Cannot find PCI Express capability\n",
 			 __func__);
-		goto abort;
+		goto abort_ctrl;
 	}
 	if (pciehp_readl(ctrl, SLOTCAP, &slot_cap)) {
 		ctrl_err(ctrl, "%s: Cannot read SLOTCAP register\n", __func__);
-		goto abort;
+		goto abort_ctrl;
 	}
 
 	ctrl->slot_cap = slot_cap;