diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-10 10:04:50 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-10 10:04:50 -0800 |
commit | 44f6cc318abb51956f823d4eed605c1e354f6186 (patch) | |
tree | 3f32d740cf6b02092ef8f00d37dbc4345ee4e0e8 /drivers/pci/slot.c | |
parent | 061afe9fe1a295ef950cf7e6c92fa7d4ae226f28 (diff) | |
parent | 2a42d9dba7842422ffb2c02e75288a8bc2fd5065 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCIe: ASPM: Break out of endless loop waiting for PCI config bits to switch
PCI: stop leaking 'slot_name' in pci_create_slot
Diffstat (limited to 'drivers/pci/slot.c')
-rw-r--r-- | drivers/pci/slot.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c index 4dd1c3e157a..5a8ccb4f604 100644 --- a/drivers/pci/slot.c +++ b/drivers/pci/slot.c @@ -253,6 +253,7 @@ placeholder: __func__, pci_domain_nr(parent), parent->number, slot_nr); out: + kfree(slot_name); up_write(&pci_bus_sem); return slot; err: |