Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 286468
b: refs/heads/master
c: 25169b7
h: refs/heads/master
v: v3
  • Loading branch information
Zhang Rui authored and Len Brown committed Jan 17, 2012
1 parent 933c68d commit df34176
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 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: 7fce7a4b0db7d90db553faf568853d56cd908c39
refs/heads/master: 25169b77f7c33b363db7d099d67491e977cdefc7
10 changes: 6 additions & 4 deletions trunk/drivers/acpi/acpica/rsxface.c
Original file line number Diff line number Diff line change
Expand Up @@ -526,8 +526,9 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context)
*
* PARAMETERS: device_handle - Handle to the device object for the
* device we are querying
* Name - Method name of the resources we want
* (METHOD_NAME__CRS or METHOD_NAME__PRS)
* Name - Method name of the resources we want.
* (METHOD_NAME__CRS, METHOD_NAME__PRS, or
* METHOD_NAME__AEI)
* user_function - Called for each resource
* Context - Passed to user_function
*
Expand All @@ -554,11 +555,12 @@ acpi_walk_resources(acpi_handle device_handle,

if (!device_handle || !user_function || !name ||
(!ACPI_COMPARE_NAME(name, METHOD_NAME__CRS) &&
!ACPI_COMPARE_NAME(name, METHOD_NAME__PRS))) {
!ACPI_COMPARE_NAME(name, METHOD_NAME__PRS) &&
!ACPI_COMPARE_NAME(name, METHOD_NAME__AEI))) {
return_ACPI_STATUS(AE_BAD_PARAMETER);
}

/* Get the _CRS or _PRS resource list */
/* Get the _CRS/_PRS/_AEI resource list */

buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;
status = acpi_rs_get_method_data(device_handle, name, &buffer);
Expand Down
1 change: 1 addition & 0 deletions trunk/include/acpi/acnames.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
#define METHOD_NAME__PRT "_PRT"
#define METHOD_NAME__CRS "_CRS"
#define METHOD_NAME__PRS "_PRS"
#define METHOD_NAME__AEI "_AEI"
#define METHOD_NAME__PRW "_PRW"
#define METHOD_NAME__SRS "_SRS"

Expand Down

0 comments on commit df34176

Please sign in to comment.