Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141980
b: refs/heads/master
c: 07de5bd
h: refs/heads/master
v: v3
  • Loading branch information
Krzysztof Kosiński authored and Len Brown committed Apr 3, 2009
1 parent 202eed2 commit 9b10a28
Show file tree
Hide file tree
Showing 2 changed files with 4 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: a59d1637eb0e0a37ee0e5c92800c60abe3624e24
refs/heads/master: 07de5bdb7bad607e29dc17c345717403a76a334c
7 changes: 3 additions & 4 deletions trunk/drivers/platform/x86/tc1100-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@ static int get_state(u32 *out, u8 instance)
return -ENODEV;

obj = (union acpi_object *) result.pointer;
if (obj && obj->type == ACPI_TYPE_BUFFER &&
obj->buffer.length == sizeof(u32)) {
tmp = *((u32 *) obj->buffer.pointer);
if (obj && obj->type == ACPI_TYPE_INTEGER) {
tmp = obj->integer.value;
} else {
tmp = 0;
}
Expand All @@ -109,7 +108,7 @@ static int get_state(u32 *out, u8 instance)
*out = (tmp == 3) ? 1 : 0;
return 0;
case TC1100_INSTANCE_JOGDIAL:
*out = (tmp == 1) ? 1 : 0;
*out = (tmp == 1) ? 0 : 1;
return 0;
default:
return -ENODEV;
Expand Down

0 comments on commit 9b10a28

Please sign in to comment.