From 0512931c552b50d141df103fb196c9b13c9198e5 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Thu, 12 Jan 2012 10:55:16 +0100 Subject: [PATCH] --- yaml --- r: 294689 b: refs/heads/master c: 8f0cdddcd3f270901765fc909c3aee37a2091e78 h: refs/heads/master i: 294687: ba17b23bb7c63283acb7cc70dacbf62e1ac7a635 v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/ibmphp_ebda.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 879eff44e000..267c09c931c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f382a086f3129edc152b8044b69ccc6682e637bb +refs/heads/master: 8f0cdddcd3f270901765fc909c3aee37a2091e78 diff --git a/trunk/drivers/pci/hotplug/ibmphp_ebda.c b/trunk/drivers/pci/hotplug/ibmphp_ebda.c index 2850e64dedae..714ca5c4ed50 100644 --- a/trunk/drivers/pci/hotplug/ibmphp_ebda.c +++ b/trunk/drivers/pci/hotplug/ibmphp_ebda.c @@ -368,8 +368,10 @@ int __init ibmphp_access_ebda (void) debug ("rio blk id: %x\n", blk_id); rio_table_ptr = kzalloc(sizeof(struct rio_table_hdr), GFP_KERNEL); - if (!rio_table_ptr) - return -ENOMEM; + if (!rio_table_ptr) { + rc = -ENOMEM; + goto out; + } rio_table_ptr->ver_num = readb (io_mem + offset); rio_table_ptr->scal_count = readb (io_mem + offset + 1); rio_table_ptr->riodev_count = readb (io_mem + offset + 2);