Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

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

diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c
index b1b6e45..616df44 100644 (file)
--- a/drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/drivers/pci/hotplug/cpqphp_ctrl.c
@@ -2812,18 +2812,16 @@ static int configure_new_function(struct controller *ctrl, struct pci_func *func
 
                                        dbg("CND:      length = 0x%x\n", base);
                                        io_node = get_io_resource(&(resources->io_head), base);
+                                       if (!io_node)
+                                               return -ENOMEM;
                                        dbg("Got io_node start = %8.8x, length = %8.8x next (%p)\n",
                                            io_node->base, io_node->length, io_node->next);
                                        dbg("func (%p) io_head (%p)\n", func, func->io_head);
 
                                        /* allocate the resource to the board */
-                                       if (io_node) {
-                                               base = io_node->base;
-
-                                               io_node->next = func->io_head;
-                                               func->io_head = io_node;
-                                       } else
-                                               return -ENOMEM;
+                                       base = io_node->base;
+                                       io_node->next = func->io_head;
+                                       func->io_head = io_node;
                                } else if ((temp_register & 0x0BL) == 0x08) {
                                        /* Map prefetchable memory */
                                        base = temp_register & 0xFFFFFFF0;