diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-26 04:25:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-26 04:25:59 -0400 |
| commit | 3cf430b0636045dc524759a0852293ba037732a7 (patch) | |
| tree | 2c4e03f9028dc23ab4e6ca5a3a5a263af397984f /drivers/acpi/wmi.c | |
| parent | 93dcf55f828b035fc93fc19eb03c1390e1e6d570 (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'drivers/acpi/wmi.c')
| -rw-r--r-- | drivers/acpi/wmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/wmi.c b/drivers/acpi/wmi.c index c33b1c6e93b1..cfe2c833474d 100644 --- a/drivers/acpi/wmi.c +++ b/drivers/acpi/wmi.c | |||
| @@ -347,7 +347,7 @@ struct acpi_buffer *out) | |||
| 347 | strcpy(method, "WQ"); | 347 | strcpy(method, "WQ"); |
| 348 | strncat(method, block->object_id, 2); | 348 | strncat(method, block->object_id, 2); |
| 349 | 349 | ||
| 350 | status = acpi_evaluate_object(handle, method, NULL, out); | 350 | status = acpi_evaluate_object(handle, method, &input, out); |
| 351 | 351 | ||
| 352 | /* | 352 | /* |
| 353 | * If ACPI_WMI_EXPENSIVE, call the relevant WCxx method, even if | 353 | * If ACPI_WMI_EXPENSIVE, call the relevant WCxx method, even if |