summaryrefslogtreecommitdiff
path: root/drivers/platform
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2021-06-18 15:55:10 +0300
committerHans de Goede <hdegoede@redhat.com>2021-06-22 12:14:49 +0300
commita4310246430096a876a8d54ca7ad52d6603b9cda (patch)
tree2e95bfea2ff49bc002c6902d6617ea6e3ab9a827 /drivers/platform
parent3ece696c1acaa2ecac2e55143fc0c3ac413369c0 (diff)
downloadlinux-a4310246430096a876a8d54ca7ad52d6603b9cda.tar.xz
platform/x86: intel_skl_int3472: Free ACPI device resources after use
We may free ACPI device resources immediately after use. Refactor skl_int3472_parse_crs() accordingly. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Daniel Scally <djrscally@gmail.com> Tested-by: Daniel Scally <djrscally@gmail.com> Link: https://lore.kernel.org/r/20210618125516.53510-2-andriy.shevchenko@linux.intel.com Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/intel-int3472/intel_skl_int3472_discrete.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/platform/x86/intel-int3472/intel_skl_int3472_discrete.c b/drivers/platform/x86/intel-int3472/intel_skl_int3472_discrete.c
index 8c18dbff1c43..48a00a1f4fb6 100644
--- a/drivers/platform/x86/intel-int3472/intel_skl_int3472_discrete.c
+++ b/drivers/platform/x86/intel-int3472/intel_skl_int3472_discrete.c
@@ -308,8 +308,10 @@ static int skl_int3472_parse_crs(struct int3472_discrete_device *int3472)
ret = acpi_dev_get_resources(int3472->adev, &resource_list,
skl_int3472_handle_gpio_resources,
int3472);
- if (ret)
- goto out_free_res_list;
+ if (ret < 0)
+ return ret;
+
+ acpi_dev_free_resource_list(&resource_list);
/*
* If we find no clock enable GPIO pin then the privacy LED won't work.
@@ -319,7 +321,7 @@ static int skl_int3472_parse_crs(struct int3472_discrete_device *int3472)
if (int3472->clock.ena_gpio) {
ret = skl_int3472_register_clock(int3472);
if (ret)
- goto out_free_res_list;
+ return ret;
} else {
if (int3472->clock.led_gpio)
dev_warn(int3472->dev,
@@ -329,10 +331,7 @@ static int skl_int3472_parse_crs(struct int3472_discrete_device *int3472)
int3472->gpios.dev_id = int3472->sensor_name;
gpiod_add_lookup_table(&int3472->gpios);
-out_free_res_list:
- acpi_dev_free_resource_list(&resource_list);
-
- return ret;
+ return 0;
}
int skl_int3472_discrete_probe(struct platform_device *pdev)