disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/acpi/acpica/utids.c
..
..
@@ -3,7 +3,7 @@
3
3
  *
4
4
  * Module Name: utids - support for device Ids - HID, UID, CID, SUB, CLS
5
5
  *
6
- * Copyright (C) 2000 - 2018, Intel Corp.
6
+ * Copyright (C) 2000 - 2020, Intel Corp.
7
7
  *
8
8
  *****************************************************************************/
9
9
 
..
..
@@ -263,8 +263,7 @@
263
263
 	 * 3) Size of the actual CID strings
264
264
 	 */
265
265
 	cid_list_size = sizeof(struct acpi_pnp_device_id_list) +
266
-	    ((count - 1) * sizeof(struct acpi_pnp_device_id)) +
267
-	    string_area_size;
266
+	    (count * sizeof(struct acpi_pnp_device_id)) + string_area_size;
268
267
 
269
268
 	cid_list = ACPI_ALLOCATE_ZEROED(cid_list_size);
270
269
 	if (!cid_list) {
..
..
@@ -289,9 +288,7 @@
289
288
 						  value);
290
289
 			length = ACPI_EISAID_STRING_SIZE;
291
290
 		} else {	/* ACPI_TYPE_STRING */
292
-
293
291
 			/* Copy the String CID from the returned object */
294
-
295
292
 			strcpy(next_id_string, cid_objects[i]->string.pointer);
296
293
 			length = cid_objects[i]->string.length + 1;
297
294
 		}