Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

effe008d · Linus Torvalds <[email protected]> · 2008-03-10 18:05:47 -07:00

* 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

Commit: effe008d276f52674d5352deefb68ec409a5ef9b
Parents: ee215ca3 · b91aac29

Merge commit. Changes below are compared with the first parent: ee215ca3.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
drivers/pci/hotplug/ibmphp_ebda.c	modified	+1	−0	View file

drivers/pci/hotplug/ibmphp_ebda.c

View file

diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c
index 600ed7b..bbccde9 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;
 			}