Merge branch 'bugfixes' into test

This commit is contained in:
Len Brown
2008-10-22 23:19:50 -04:00
9 changed files with 183 additions and 86 deletions

View File

@@ -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;