Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 202481
b: refs/heads/master
c: 6690486
h: refs/heads/master
i:
  202479: f660513
v: v3
  • Loading branch information
Axel Lin authored and Matthew Garrett committed Aug 3, 2010
1 parent 65ded41 commit 7d0825e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 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: f8ef3aecabe0e386303d028d02b6e5b23ac3a566
refs/heads/master: 669048639ca6d3fdfb2e75dd77b8f49434d57625
10 changes: 7 additions & 3 deletions trunk/drivers/platform/x86/acer-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,7 @@ static acpi_status WMID_set_capabilities(void)
obj->buffer.length == sizeof(u32)) {
devices = *((u32 *) obj->buffer.pointer);
} else {
kfree(out.pointer);
return AE_ERROR;
}

Expand All @@ -788,6 +789,7 @@ static acpi_status WMID_set_capabilities(void)
if (!(devices & 0x20))
max_brightness = 0x9;

kfree(out.pointer);
return status;
}

Expand Down Expand Up @@ -1094,6 +1096,7 @@ static u32 get_wmid_devices(void)
struct acpi_buffer out = {ACPI_ALLOCATE_BUFFER, NULL};
union acpi_object *obj;
acpi_status status;
u32 devices = 0;

status = wmi_query_block(WMID_GUID2, 1, &out);
if (ACPI_FAILURE(status))
Expand All @@ -1102,10 +1105,11 @@ static u32 get_wmid_devices(void)
obj = (union acpi_object *) out.pointer;
if (obj && obj->type == ACPI_TYPE_BUFFER &&
obj->buffer.length == sizeof(u32)) {
return *((u32 *) obj->buffer.pointer);
} else {
return 0;
devices = *((u32 *) obj->buffer.pointer);
}

kfree(out.pointer);
return devices;
}

/*
Expand Down

0 comments on commit 7d0825e

Please sign in to comment.