---

yaml --- r: 117231 b: refs/heads/master c: 05a34f5 h: refs/heads/master i: 117229: 9aa3da1 117227: 3ca9ede 117223: 8d2570c 117215: 79bd32d v: v3
git-mirror · Oct 22, 2008 · ff2a9ce · ff2a9ce
1 parent b52e62a
commit ff2a9ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;