diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:19:50 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:19:50 -0400 |
| commit | 955ba395616a78780e70dc3f3b0b56ca4db52e5c (patch) | |
| tree | f5978cfdc2b5ede82445de6675301a0171e66ea0 /drivers/acpi/wmi.c | |
| parent | aa58329fc8ec50b379388fcad55f62c3493730d3 (diff) | |
| parent | 383d7a11c9989205db44c7f1be339e5097062f03 (diff) | |
| download | op-kernel-dev-955ba395616a78780e70dc3f3b0b56ca4db52e5c.zip op-kernel-dev-955ba395616a78780e70dc3f3b0b56ca4db52e5c.tar.gz | |
Merge branch 'bugfixes' into test
Diffstat (limited to 'drivers/acpi/wmi.c')
| -rw-r--r-- | drivers/acpi/wmi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/wmi.c b/drivers/acpi/wmi.c index 5464cfc..47cd7ba 100644 --- a/drivers/acpi/wmi.c +++ b/drivers/acpi/wmi.c @@ -271,7 +271,7 @@ u32 method_id, const struct acpi_buffer *in, struct acpi_buffer *out) char method[4] = "WM"; if (!find_guid(guid_string, &wblock)) - return AE_BAD_ADDRESS; + return AE_ERROR; block = &wblock->gblock; handle = wblock->handle; @@ -333,7 +333,7 @@ struct acpi_buffer *out) return AE_BAD_PARAMETER; if (!find_guid(guid_string, &wblock)) - return AE_BAD_ADDRESS; + return AE_ERROR; block = &wblock->gblock; handle = wblock->handle; @@ -343,7 +343,7 @@ struct acpi_buffer *out) /* Check GUID is a data block */ if (block->flags & (ACPI_WMI_EVENT | ACPI_WMI_METHOD)) - return AE_BAD_ADDRESS; + return AE_ERROR; input.count = 1; input.pointer = wq_params; @@ -414,7 +414,7 @@ const struct acpi_buffer *in) return AE_BAD_DATA; if (!find_guid(guid_string, &wblock)) - return AE_BAD_ADDRESS; + return AE_ERROR; block = &wblock->gblock; handle = wblock->handle; @@ -424,7 +424,7 @@ const struct acpi_buffer *in) /* Check GUID is a data block */ if (block->flags & (ACPI_WMI_EVENT | ACPI_WMI_METHOD)) - return AE_BAD_ADDRESS; + return AE_ERROR; input.count = 2; input.pointer = params; |
