lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pull bugfix into test branch

Browse Source
This commit is contained in:
Len Brown
2006-12-20 02:52:50 -05:00
parent 706b75ddbe 6796a1204c
commit 3be11c8f4f
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/Kconfig
View File

@@ -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

2
drivers/acpi/osl.c
View File

@@ -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;

7
drivers/acpi/pci_root.c
View File

@@ -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) if (*pptr == driver)
continue;
*pptr = (*pptr)->next;
break; break;
pptr = &(*pptr)->next;
} }
BUG_ON(!*pptr);
*pptr = (*pptr)->next;
if (!driver->remove) if (!driver->remove)
return; return;

4
drivers/acpi/processor_core.c
View File

@@ -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();