]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
thermal: int340x: Consolidate freeing of acpi_buffer pointer
authorDavidlohr Bueso <dave@stgolabs.net>
Thu, 24 Mar 2022 19:09:49 +0000 (12:09 -0700)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 5 Apr 2022 18:25:21 +0000 (20:25 +0200)
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>
drivers/thermal/intel/int340x_thermal/int3400_thermal.c

index 0e7931c286ec9aec75980e5ede93948202100917..e299873d50b8c99670db9df07e30fc063df990e5 100644 (file)
@@ -508,21 +508,18 @@ static void int3400_setup_gddv(struct int3400_thermal_priv *priv)
 
        obj = buffer.pointer;
        if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count != 1
-           || obj->package.elements[0].type != ACPI_TYPE_BUFFER) {
-               kfree(buffer.pointer);
-               return;
-       }
+           || obj->package.elements[0].type != ACPI_TYPE_BUFFER)
+               goto out_free;
 
        priv->data_vault = kmemdup(obj->package.elements[0].buffer.pointer,
                                   obj->package.elements[0].buffer.length,
                                   GFP_KERNEL);
-       if (!priv->data_vault) {
-               kfree(buffer.pointer);
-               return;
-       }
+       if (!priv->data_vault)
+               goto out_free;
 
        bin_attr_data_vault.private = priv->data_vault;
        bin_attr_data_vault.size = obj->package.elements[0].buffer.length;
+out_free:
        kfree(buffer.pointer);
 }