From 933275935523f3d54fc8a06569c098c6e8abc47b Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Wed, 24 Oct 2007 18:25:00 +0200
Subject: [PATCH] --- yaml --- r: 73187 b: refs/heads/master c:
 00395410885cac96015850426bf697423a3ec9dc h: refs/heads/master i:   73185:
 3731fe46ae05f9e84bd916ae1047fa63f5e2c203   73183:
 c5d534e1c82869f10f1f82821b7870c5d5e0ff56 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/pci/hotplug/cpqphp_ctrl.c | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index d08c6029d3a2..32bc2cb8aa66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d73460d79bc88de74221d73723ed61a0081b7a36
+refs/heads/master: 00395410885cac96015850426bf697423a3ec9dc
diff --git a/trunk/drivers/pci/hotplug/cpqphp_ctrl.c b/trunk/drivers/pci/hotplug/cpqphp_ctrl.c
index 3ef0a4875a62..856d57b4d604 100644
--- a/trunk/drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/trunk/drivers/pci/hotplug/cpqphp_ctrl.c
@@ -1931,16 +1931,14 @@ void cpqhp_pushbutton_thread(unsigned long slot)
 			return ;
 		}
 
-		if (func != NULL && ctrl != NULL) {
-			if (cpqhp_process_SS(ctrl, func) != 0) {
-				amber_LED_on (ctrl, hp_slot);
-				green_LED_on (ctrl, hp_slot);
-				
-				set_SOGO(ctrl);
+		if (cpqhp_process_SS(ctrl, func) != 0) {
+			amber_LED_on(ctrl, hp_slot);
+			green_LED_on(ctrl, hp_slot);
 
-				/* Wait for SOBS to be unset */
-				wait_for_ctrl_irq (ctrl);
-			}
+			set_SOGO(ctrl);
+
+			/* Wait for SOBS to be unset */
+			wait_for_ctrl_irq(ctrl);
 		}
 
 		p_slot->state = STATIC_STATE;