diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2020-09-11 20:00:20 -0400 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2020-09-11 20:00:20 -0400 |
| commit | 0ea8a56de21be24cb79abb03dee79aabcd60a316 (patch) | |
| tree | 71ad6c51064e4948b5c90e84c86da52457e2cfb2 /drivers/acpi/acpica/utids.c | |
| parent | 0560c2173e3f12bc39ef5d61b26d43307cab8694 (diff) | |
| parent | 166774a2c2c6b82da5d984f587567071ff00c1f3 (diff) | |
| download | linux-stable-0ea8a56de21be24cb79abb03dee79aabcd60a316.tar.gz linux-stable-0ea8a56de21be24cb79abb03dee79aabcd60a316.tar.bz2 linux-stable-0ea8a56de21be24cb79abb03dee79aabcd60a316.zip | |
Merge drm/drm-next into drm-intel-next-queued
Sync drm-intel-gt-next here so we can have an unified fixes flow.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/utids.c')
| -rw-r--r-- | drivers/acpi/acpica/utids.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c index 3bb06935a2ad..3e68864ef242 100644 --- a/drivers/acpi/acpica/utids.c +++ b/drivers/acpi/acpica/utids.c @@ -263,8 +263,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node, * 3) Size of the actual CID strings */ cid_list_size = sizeof(struct acpi_pnp_device_id_list) + - ((count - 1) * sizeof(struct acpi_pnp_device_id)) + - string_area_size; + (count * sizeof(struct acpi_pnp_device_id)) + string_area_size; cid_list = ACPI_ALLOCATE_ZEROED(cid_list_size); if (!cid_list) { |