diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-20 02:52:50 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-20 02:52:50 -0500 |
| commit | 3be11c8f4f2fa194834c2e83540f34da442b8977 (patch) | |
| tree | 35386fe97c1dd62a261c297512b8e5137b56c35d | |
| parent | 706b75ddbe36d20d071424f9867385c319b67f8d (diff) | |
| parent | 6796a1204cfeac6dab1c2dd682d1138454eca661 (diff) | |
| download | linux-3be11c8f4f2fa194834c2e83540f34da442b8977.tar.bz2 | |
Pull bugfix into test branch
| -rw-r--r-- | drivers/acpi/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/acpi/osl.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/pci_root.c | 9 | ||||
| -rw-r--r-- | drivers/acpi/processor_core.c | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b0897a0b206c..1639998e4d27 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -11,7 +11,7 @@ config ACPI bool "ACPI Support" depends on IA64 || X86 depends on PCI - select PM + depends on PM default y ---help--- Advanced Configuration and Power Interface (ACPI) support for diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index b7ca020a0565..57ae1e5cde0a 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -1032,7 +1032,7 @@ acpi_status acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache) { *cache = kmem_cache_create(name, size, 0, 0, NULL, NULL); - if (cache == NULL) + if (*cache == NULL) return AE_ERROR; else return AE_OK; diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 03e03741c140..b9c52cdbf658 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -98,11 +98,12 @@ void acpi_pci_unregister_driver(struct acpi_pci_driver *driver) struct acpi_pci_driver **pptr = &sub_driver; while (*pptr) { - if (*pptr != driver) - continue; - *pptr = (*pptr)->next; - break; + if (*pptr == driver) + break; + pptr = &(*pptr)->next; } + BUG_ON(!*pptr); + *pptr = (*pptr)->next; if (!driver->remove) return; diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 3e70a08e4a8b..89b3610feb47 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -901,13 +901,13 @@ static int __init acpi_processor_init(void) acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir); if (!acpi_processor_dir) - return 0; + return -ENOMEM; acpi_processor_dir->owner = THIS_MODULE; result = acpi_bus_register_driver(&acpi_processor_driver); if (result < 0) { remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir); - return 0; + return result; } acpi_processor_install_hotplug_notify(); |