diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 13:57:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 13:57:13 -0700 |
| commit | 5042d99795d3d817bef2f4cc46e953bee9bf7398 (patch) | |
| tree | 9263e28b67093eca6edd221f04830e5841f67c57 /drivers/acpi | |
| parent | 5c402355adf8f920531f02099f4ec0d2bccd4c64 (diff) | |
| parent | f17a077e61b627e58db5926bc474cf308318dad9 (diff) | |
| download | linux-5042d99795d3d817bef2f4cc46e953bee9bf7398.tar.bz2 | |
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:
PCI: fixup sparse endianness warnings in proc.c
PCI PM: make more PCI PM core functionality available to drivers
PCI/DMAR: don't assume presence of RMRRs
PCI hotplug: fix error path in pci_slot's register_slot
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/pci_slot.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c index b9ab030a52d5..dd376f7ad090 100644 --- a/drivers/acpi/pci_slot.c +++ b/drivers/acpi/pci_slot.c @@ -6,8 +6,8 @@ * Thanks to Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> for code * review and fixes. * - * Copyright (C) 2007 Alex Chiang <achiang@hp.com> - * Copyright (C) 2007 Hewlett-Packard Development Company, L.P. + * Copyright (C) 2007-2008 Hewlett-Packard Development Company, L.P. + * Alex Chiang <achiang@hp.com> * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -158,6 +158,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) if (IS_ERR(pci_slot)) { err("pci_create_slot returned %ld\n", PTR_ERR(pci_slot)); kfree(slot); + return AE_OK; } slot->root_handle = parent_context->root_handle; |