Browse Source

Pull bugfix into test branch

Len Brown 18 years ago
parent
commit
3be11c8f4f
4 changed files with 9 additions and 8 deletions
  1. 1 1
      drivers/acpi/Kconfig
  2. 1 1
      drivers/acpi/osl.c
  3. 5 4
      drivers/acpi/pci_root.c
  4. 2 2
      drivers/acpi/processor_core.c

+ 1 - 1
drivers/acpi/Kconfig

@@ -11,7 +11,7 @@ config ACPI
 	bool "ACPI Support"
 	bool "ACPI Support"
 	depends on IA64 || X86
 	depends on IA64 || X86
 	depends on PCI
 	depends on PCI
-	select PM
+	depends on PM
 	default y
 	default y
 	---help---
 	---help---
 	  Advanced Configuration and Power Interface (ACPI) support for 
 	  Advanced Configuration and Power Interface (ACPI) support for 

+ 1 - 1
drivers/acpi/osl.c

@@ -1032,7 +1032,7 @@ acpi_status
 acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache)
 acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache)
 {
 {
 	*cache = kmem_cache_create(name, size, 0, 0, NULL, NULL);
 	*cache = kmem_cache_create(name, size, 0, 0, NULL, NULL);
-	if (cache == NULL)
+	if (*cache == NULL)
 		return AE_ERROR;
 		return AE_ERROR;
 	else
 	else
 		return AE_OK;
 		return AE_OK;

+ 5 - 4
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;
 	struct acpi_pci_driver **pptr = &sub_driver;
 	while (*pptr) {
 	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)
 	if (!driver->remove)
 		return;
 		return;

+ 2 - 2
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);
 	acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir);
 	if (!acpi_processor_dir)
 	if (!acpi_processor_dir)
-		return 0;
+		return -ENOMEM;
 	acpi_processor_dir->owner = THIS_MODULE;
 	acpi_processor_dir->owner = THIS_MODULE;
 
 
 	result = acpi_bus_register_driver(&acpi_processor_driver);
 	result = acpi_bus_register_driver(&acpi_processor_driver);
 	if (result < 0) {
 	if (result < 0) {
 		remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
 		remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
-		return 0;
+		return result;
 	}
 	}
 
 
 	acpi_processor_install_hotplug_notify();
 	acpi_processor_install_hotplug_notify();