Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 128073
b: refs/heads/master
c: 3e54048
h: refs/heads/master
i:
  128071: e41dad9
v: v3
  • Loading branch information
Hannes Eder authored and Len Brown committed Nov 30, 2008
1 parent edb030d commit beebd44
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c5279dee26c0e8d7c4200993bfc4b540d2469598
refs/heads/master: 3e54048691bce3f323fd5460695273be379803b9
4 changes: 2 additions & 2 deletions trunk/drivers/acpi/ec.c
Original file line number Diff line number Diff line change
Expand Up @@ -979,6 +979,7 @@ int __init acpi_ec_ecdt_probe(void)
{
acpi_status status;
struct acpi_table_ecdt *ecdt_ptr;
acpi_handle dummy;

boot_ec = make_acpi_ec();
if (!boot_ec)
Expand Down Expand Up @@ -1011,7 +1012,6 @@ int __init acpi_ec_ecdt_probe(void)
}
/* 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);
Expand All @@ -1022,7 +1022,7 @@ int __init acpi_ec_ecdt_probe(void)
* 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", &dummy)))
return -ENODEV;
install:
if (!ec_install_handlers(boot_ec)) {
Expand Down

0 comments on commit beebd44

Please sign in to comment.