diff options
| author | Dmitry Torokhov <[email protected]> | 2016-06-18 17:25:08 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2016-06-18 17:25:08 -0700 |
| commit | 6ea24cf79e055f0a62a64baa8587e2254a493c7b (patch) | |
| tree | c5cd6113ed93854b1bc30cd471c366f080c4be2f /drivers/acpi/utils.c | |
| parent | 540c26087bfbad6ea72758b76b16ae6282a73fea (diff) | |
| parent | 488326947cd1f038da8d2c9068a0d07b913b7983 (diff) | |
Merge branch 'cec-defines' into for-linus
Let's bring in HDMI CEC defines to ease merging CEC support in the next
merge window.
Diffstat (limited to 'drivers/acpi/utils.c')
| -rw-r--r-- | drivers/acpi/utils.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index f2f9873bb5c3..050673f0c0b3 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -201,10 +201,6 @@ acpi_extract_package(union acpi_object *package, u8 **pointer = NULL; union acpi_object *element = &(package->package.elements[i]); - if (!element) { - return AE_BAD_DATA; - } - switch (element->type) { case ACPI_TYPE_INTEGER: @@ -696,7 +692,7 @@ bool acpi_check_dsm(acpi_handle handle, const u8 *uuid, int rev, u64 funcs) mask = obj->integer.value; else if (obj->type == ACPI_TYPE_BUFFER) for (i = 0; i < obj->buffer.length && i < 8; i++) - mask |= (((u8)obj->buffer.pointer[i]) << (i * 8)); + mask |= (((u64)obj->buffer.pointer[i]) << (i * 8)); ACPI_FREE(obj); /* |