Skip to content

Commit 9e5d3d6

Browse files
Davidlohr Buesorafaeljw
authored andcommitted
thermal: int340x: Consolidate freeing of acpi_buffer pointer
Introduce a single point of freeing/exit after ensuring no error in int3400_setup_gddv(). Signed-off-by: Davidlohr Bueso <dave@stgolabs.net> Acked-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent bdff938 commit 9e5d3d6

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

drivers/thermal/intel/int340x_thermal/int3400_thermal.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -508,21 +508,18 @@ static void int3400_setup_gddv(struct int3400_thermal_priv *priv)
508508

509509
obj = buffer.pointer;
510510
if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count != 1
511-
|| obj->package.elements[0].type != ACPI_TYPE_BUFFER) {
512-
kfree(buffer.pointer);
513-
return;
514-
}
511+
|| obj->package.elements[0].type != ACPI_TYPE_BUFFER)
512+
goto out_free;
515513

516514
priv->data_vault = kmemdup(obj->package.elements[0].buffer.pointer,
517515
obj->package.elements[0].buffer.length,
518516
GFP_KERNEL);
519-
if (!priv->data_vault) {
520-
kfree(buffer.pointer);
521-
return;
522-
}
517+
if (!priv->data_vault)
518+
goto out_free;
523519

524520
bin_attr_data_vault.private = priv->data_vault;
525521
bin_attr_data_vault.size = obj->package.elements[0].buffer.length;
522+
out_free:
526523
kfree(buffer.pointer);
527524
}
528525

0 commit comments

Comments
 (0)