diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-05 00:13:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-05 00:13:46 -0800 |
| commit | 468e6d17ff42e6f291a88c87681b2b5e34e9ab33 (patch) | |
| tree | 2877d59eef8cc3a59cc647c4daf50dabea3f065a /drivers/hotplug | |
| parent | d694597ed5e1f6613d0933ee692333ab2542b603 (diff) | |
v2.5.2.1 -> v2.5.2.1.1
- David Howells: abtract out "current->need_resched" as "need_resched()"
- Frank Davis: ide-tape update for bio
- various: header file fixups
- Jens Axboe: fix up bio/ide/highmem issues
- Kai Germaschewski: ISDN update
- Tim Waugh: parport update
- Patrik Mochel: initcall update
- Greg KH: USB and Compaq PCI hotplug updates
Diffstat (limited to 'drivers/hotplug')
| -rw-r--r-- | drivers/hotplug/cpqphp_core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hotplug/cpqphp_core.c b/drivers/hotplug/cpqphp_core.c index 5b4861915c72..ddcd791f4f27 100644 --- a/drivers/hotplug/cpqphp_core.c +++ b/drivers/hotplug/cpqphp_core.c @@ -404,6 +404,10 @@ static int ctrl_slot_setup (struct controller * ctrl, void *smbios_start, void * result = pci_hp_register (new_slot->hotplug_slot); if (result) { err ("pci_hp_register failed with error %d\n", result); + kfree (new_slot->hotplug_slot->info); + kfree (new_slot->hotplug_slot->name); + kfree (new_slot->hotplug_slot); + kfree (new_slot); return result; } @@ -429,6 +433,8 @@ static int ctrl_slot_cleanup (struct controller * ctrl) while (old_slot) { next_slot = old_slot->next; pci_hp_deregister (old_slot->hotplug_slot); + kfree(old_slot->hotplug_slot->info); + kfree(old_slot->hotplug_slot->name); kfree(old_slot->hotplug_slot); kfree(old_slot); old_slot = next_slot; |