From ce7a7fe7446b9ec441f995318af852586b5fb4d1 Mon Sep 17 00:00:00 2001
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Date: Thu, 20 Sep 2012 23:29:46 +0000
Subject: [PATCH] --- yaml --- r: 330380 b: refs/heads/master c:
 7844663a31e97930e3949430573452ac245bfdd5 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/powerpc/platforms/pseries/eeh_pe.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e7ae8894b266..61c45d461bb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e166991c0c3631b8af5a26990df77fa2a1d09e6
+refs/heads/master: 7844663a31e97930e3949430573452ac245bfdd5
diff --git a/trunk/arch/powerpc/platforms/pseries/eeh_pe.c b/trunk/arch/powerpc/platforms/pseries/eeh_pe.c
index 9d35543736ed..797cd181dc3f 100644
--- a/trunk/arch/powerpc/platforms/pseries/eeh_pe.c
+++ b/trunk/arch/powerpc/platforms/pseries/eeh_pe.c
@@ -105,11 +105,8 @@ static struct eeh_pe *eeh_phb_pe_get(struct pci_controller *phb)
 		 * the PE for PHB has been determined when that
 		 * was created.
 		 */
-		if ((pe->type & EEH_PE_PHB) &&
-		    pe->phb == phb) {
-			eeh_unlock();
+		if ((pe->type & EEH_PE_PHB) && pe->phb == phb)
 			return pe;
-		}
 	}
 
 	return NULL;