aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-10 18:05:47 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-10 18:05:47 -0700
commiteffe008d276f52674d5352deefb68ec409a5ef9b (patch)
treed90c07be8a4842a9419c0a6c685f4d68bfa31959
parentee215ca3b21dd73bec95dcaaa8c89e64cff6cbf8 (diff)
parentb91aac29bb9b7cab34b0297449bd2a16944b83d9 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6: PCI Hotplug: Fix small mem leak in IBM Hot Plug Controller Driver PCI: rename DECLARE_PCI_DEVICE_TABLE to DEFINE_PCI_DEVICE_TABLE
-rw-r--r--drivers/pci/hotplug/ibmphp_ebda.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c
index 600ed7b67ae..bbccde9f228 100644
--- a/drivers/pci/hotplug/ibmphp_ebda.c
+++ b/drivers/pci/hotplug/ibmphp_ebda.c
@@ -963,6 +963,7 @@ static int __init ebda_rsrc_controller (void)
bus_info_ptr1 = ibmphp_find_same_bus_num (hpc_ptr->slots[index].slot_bus_num);
if (!bus_info_ptr1) {
+ kfree(tmp_slot);
rc = -ENODEV;
goto error;
}