Merge tag 'sound-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[deliverable/linux.git] / drivers / acpi / acpica / utids.c

diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c
index 05ee76eec314f88a14b4abc2db14e5c5105ecb2f..f7cd2d52643b99a69609ad0e600d7bd4df532266 100644 (file)
--- a/drivers/acpi/acpica/utids.c
+++ b/drivers/acpi/acpica/utids.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -95,7 +95,7 @@ acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
 
        hid =
            ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pnp_device_id) +
-                                (acpi_size) length);
+                                (acpi_size)length);
        if (!hid) {
                status = AE_NO_MEMORY;
                goto cleanup;
@@ -173,7 +173,7 @@ acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
 
        uid =
            ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pnp_device_id) +
-                                (acpi_size) length);
+                                (acpi_size)length);
        if (!uid) {
                status = AE_NO_MEMORY;
                goto cleanup;
@@ -309,7 +309,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
        /* Area for CID strings starts after the CID PNP_DEVICE_ID array */
 
        next_id_string = ACPI_CAST_PTR(char, cid_list->ids) +
-           ((acpi_size) count * sizeof(struct acpi_pnp_device_id));
+           ((acpi_size)count * sizeof(struct acpi_pnp_device_id));
 
        /* Copy/convert the CIDs to the return buffer */
 
@@ -413,7 +413,7 @@ acpi_ut_execute_CLS(struct acpi_namespace_node *device_node,
 
        cls =
            ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pnp_device_id) +
-                                (acpi_size) length);
+                                (acpi_size)length);
        if (!cls) {
                status = AE_NO_MEMORY;
                goto cleanup;