diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-14 15:05:41 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-14 15:05:41 -0500 |
| commit | c5974932c1e8514d3478573bb52beebeb2c786dd (patch) | |
| tree | a204156fbb0036fb76e89ceffa15a30e90bc3f75 /drivers/acpi/wmi.c | |
| parent | 9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9 (diff) | |
| parent | e760e716d47b48caf98da348368fd41b4a9b9e7e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 457ed3d3f51c..efacc9f8bfe3 100644 --- a/drivers/acpi/wmi.c +++ b/drivers/acpi/wmi.c | |||
| @@ -247,7 +247,7 @@ u32 method_id, const struct acpi_buffer *in, struct acpi_buffer *out) | |||
| 247 | block = &wblock->gblock; | 247 | block = &wblock->gblock; |
| 248 | handle = wblock->handle; | 248 | handle = wblock->handle; |
| 249 | 249 | ||
| 250 | if (!block->flags & ACPI_WMI_METHOD) | 250 | if (!(block->flags & ACPI_WMI_METHOD)) |
| 251 | return AE_BAD_DATA; | 251 | return AE_BAD_DATA; |
| 252 | 252 | ||
| 253 | if (block->instance_count < instance) | 253 | if (block->instance_count < instance) |