vserver 2.0 rc7

[linux-2.6.git] / drivers / pci / hotplug / cpqphp_core.c

diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index 24e0699..afbccfa 100644 (file)
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -577,11 +577,11 @@ cpqhp_set_attention_status(struct controller *ctrl, struct pci_func *func,
 {
        u8 hp_slot;
 
-       hp_slot = func->device - ctrl->slot_device_offset;
-
        if (func == NULL)
                return(1);
 
+       hp_slot = func->device - ctrl->slot_device_offset;
+
        // Wait for exclusive access to hardware
        down(&ctrl->crit_sect);