From ff2a9ce265be5f85d5b79c4dc73098b581e89710 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Wed, 22 Oct 2008 16:44:00 -0700
Subject: [PATCH] --- yaml --- r: 117231 b: refs/heads/master c:
 05a34f51ba451c65773ad6f1acf4cc089cc474d8 h: refs/heads/master i:   117229:
 9aa3da191dc549c90f53298f1293e648a390f83b   117227:
 3ca9ededc0f9212f554c783bfb81eb00122cbbef   117223:
 8d2570c95cd331f7cbb0ee4bfb4ac0a9d519dc62   117215:
 79bd32d42069e58dcab67a2269f9d06ed2a4fc3d v: v3

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

diff --git a/[refs] b/[refs]
index 1879b0f08ed8..73389b597a61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1388cc964e680c1086ca0edae35be094cb29d51e
+refs/heads/master: 05a34f51ba451c65773ad6f1acf4cc089cc474d8
diff --git a/trunk/drivers/pci/hotplug/cpqphp_ctrl.c b/trunk/drivers/pci/hotplug/cpqphp_ctrl.c
index ef041ca91c27..a60a25290995 100644
--- a/trunk/drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/trunk/drivers/pci/hotplug/cpqphp_ctrl.c
@@ -1139,7 +1139,7 @@ static u8 set_controller_speed(struct controller *ctrl, u8 adapter_speed, u8 hp_
 	for(slot = ctrl->slot; slot; slot = slot->next) {
 		if (slot->device == (hp_slot + ctrl->slot_device_offset)) 
 			continue;
-		if (!slot->hotplug_slot && !slot->hotplug_slot->info) 
+		if (!slot->hotplug_slot || !slot->hotplug_slot->info)
 			continue;
 		if (slot->hotplug_slot->info->adapter_status == 0) 
 			continue;