openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pull bugzilla-9627 into release branch

This commit is contained in:
Len Brown 2008-01-11 12:28:22 -05:00
parent 6b74c92521 c04209a794
commit 456212017b
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/acpi/ec.c
View File

@ -892,6 +892,17 @@ static int acpi_ec_stop(struct acpi_device *device, int type)
return 0; return 0;
} }
int __init acpi_boot_ec_enable(void)
{
if (!boot_ec || boot_ec->handlers_installed)
return 0;
if (!ec_install_handlers(boot_ec)) {
first_ec = boot_ec;
return 0;
}
return -EFAULT;
}
int __init acpi_ec_ecdt_probe(void) int __init acpi_ec_ecdt_probe(void)
{ {
int ret; int ret;
@ -924,9 +935,10 @@ int __init acpi_ec_ecdt_probe(void)
goto error; goto error;
/* We really need to limit this workaround, the only ASUS, /* We really need to limit this workaround, the only ASUS,
* which needs it, has fake EC._INI method, so use it as flag. * which needs it, has fake EC._INI method, so use it as flag.
* Keep boot_ec struct as it will be needed soon.
*/ */
if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x))) if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x)))
goto error; return -ENODEV;
} }
ret = ec_install_handlers(boot_ec); ret = ec_install_handlers(boot_ec);

6
drivers/acpi/scan.c
View File

@ -1449,6 +1449,8 @@ static int acpi_bus_scan_fixed(struct acpi_device *root)
return result; return result;
} }
int __init acpi_boot_ec_enable(void);
static int __init acpi_scan_init(void) static int __init acpi_scan_init(void)
{ {
int result; int result;
@ -1480,6 +1482,10 @@ static int __init acpi_scan_init(void)
* Enumerate devices in the ACPI namespace. * Enumerate devices in the ACPI namespace.
*/ */
result = acpi_bus_scan_fixed(acpi_root); result = acpi_bus_scan_fixed(acpi_root);
/* EC region might be needed at bus_scan, so enable it now */
acpi_boot_ec_enable();
if (!result) if (!result)
result = acpi_bus_scan(acpi_root, &ops); result = acpi_bus_scan(acpi_root, &ops);