Merge tag 'v4.6-rc1' into for-linus-4.6

[cascardo/linux.git] / drivers / acpi / utils.c

diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index f12a724..050673f 100644 (file)
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -692,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);
 
        /*