diff options
| author | Len Brown <len.brown@intel.com> | 2007-11-20 07:18:07 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-11-20 07:18:07 +0100 |
| commit | 5824b4512650db90ddd5fdbea7f8aea3c7df3a94 (patch) | |
| tree | b8062daae958d01ffe632670efff7aa5ddc2233c /drivers/acpi | |
| parent | Pull bugzilla-9153 into release branch (diff) | |
| parent | ACPI: EC: Don't init EC early if it has no _INI (diff) | |
| download | linux-5824b4512650db90ddd5fdbea7f8aea3c7df3a94.tar.xz linux-5824b4512650db90ddd5fdbea7f8aea3c7df3a94.zip | |
Pull bugzilla-9262 into release branch
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/ec.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 06b78e5e33a1..56afe13af592 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -881,12 +881,20 @@ int __init acpi_ec_ecdt_probe(void) boot_ec->gpe = ecdt_ptr->gpe; boot_ec->handle = ACPI_ROOT_OBJECT; } else { + /* This workaround is needed only on some broken machines, + * which require early EC, but fail to provide ECDT */ + acpi_handle x; printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n"); status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device, boot_ec, NULL); /* Check that acpi_get_devices actually find something */ if (ACPI_FAILURE(status) || !boot_ec->handle) goto error; + /* We really need to limit this workaround, the only ASUS, + * which needs it, has fake EC._INI method, so use it as flag. + */ + if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x))) + goto error; } ret = ec_install_handlers(boot_ec); |