diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-11 01:05:47 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-11 01:05:47 (GMT) |
| commit | effe008d276f52674d5352deefb68ec409a5ef9b (patch) | |
| tree | d90c07be8a4842a9419c0a6c685f4d68bfa31959 | |
| parent | ee215ca3b21dd73bec95dcaaa8c89e64cff6cbf8 (diff) | |
| parent | b91aac29bb9b7cab34b0297449bd2a16944b83d9 (diff) | |
| download | linux-fsl-qoriq-effe008d276f52674d5352deefb68ec409a5ef9b.tar.xz | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c index 600ed7b6..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; } |