tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Pull bugfix into test branch

Len Brown 3be11c8f 706b75dd

+9 -8
unified split
+1 -1
drivers/acpi/Kconfig
··· 11 bool "ACPI Support" 12 depends on IA64 || X86 13 depends on PCI 14 - select PM 15 default y 16 ---help--- 17 Advanced Configuration and Power Interface (ACPI) support for
··· 11 bool "ACPI Support" 12 depends on IA64 || X86 13 depends on PCI 14 + depends on PM 15 default y 16 ---help--- 17 Advanced Configuration and Power Interface (ACPI) support for
+1 -1
drivers/acpi/osl.c
··· 1032 acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache) 1033 { 1034 *cache = kmem_cache_create(name, size, 0, 0, NULL, NULL); 1035 - if (cache == NULL) 1036 return AE_ERROR; 1037 else 1038 return AE_OK;
··· 1032 acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache) 1033 { 1034 *cache = kmem_cache_create(name, size, 0, 0, NULL, NULL); 1035 + if (*cache == NULL) 1036 return AE_ERROR; 1037 else 1038 return AE_OK;
+5 -4
drivers/acpi/pci_root.c
··· 98 99 struct acpi_pci_driver **pptr = &sub_driver; 100 while (*pptr) { 101 - if (*pptr != driver) 102 - continue; 103 - *pptr = (*pptr)->next; 104 - break; 105 } 106 107 if (!driver->remove) 108 return;
··· 98 99 struct acpi_pci_driver **pptr = &sub_driver; 100 while (*pptr) { 101 + if (*pptr == driver) 102 + break; 103 + pptr = &(*pptr)->next; 104 } 105 + BUG_ON(!*pptr); 106 + *pptr = (*pptr)->next; 107 108 if (!driver->remove) 109 return;
+2 -2
drivers/acpi/processor_core.c
··· 901 902 acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir); 903 if (!acpi_processor_dir) 904 - return 0; 905 acpi_processor_dir->owner = THIS_MODULE; 906 907 result = acpi_bus_register_driver(&acpi_processor_driver); 908 if (result < 0) { 909 remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir); 910 - return 0; 911 } 912 913 acpi_processor_install_hotplug_notify();
··· 901 902 acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir); 903 if (!acpi_processor_dir) 904 + return -ENOMEM; 905 acpi_processor_dir->owner = THIS_MODULE; 906 907 result = acpi_bus_register_driver(&acpi_processor_driver); 908 if (result < 0) { 909 remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir); 910 + return result; 911 } 912 913 acpi_processor_install_hotplug_notify();