From 0f3b44a78d7efefaf21e983507eff69aac032ecc Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Thu, 18 Feb 2021 11:57:52 +0900 Subject: [PATCH] pass-hal: standard: Fix svace warnings Change-Id: I35cff46ff50908a9f2a861f0982744fea9a5fce8 Signed-off-by: Chanwoo Choi --- src/hal-backend-power.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/hal-backend-power.c b/src/hal-backend-power.c index aa4f686..c4f52ad 100644 --- a/src/hal-backend-power.c +++ b/src/hal-backend-power.c @@ -682,26 +682,26 @@ static int power_init(void **data) cpu = calloc(1, sizeof(struct pass_resource_cpu)); if (!cpu) { - return -ENOMEM; - goto err; + ret = -ENOMEM; + goto err_funcs; } bus = calloc(1, sizeof(struct pass_resource_bus)); if (!bus) { - return -ENOMEM; - goto err; + ret = -ENOMEM; + goto err_cpu; } gpu = calloc(1, sizeof(struct pass_resource_gpu)); if (!gpu) { - return -ENOMEM; - goto err; + ret = -ENOMEM; + goto err_bus; } memory = calloc(1, sizeof(struct pass_resource_memory)); if (!memory) { ret = -ENOMEM; - goto err; + goto err_gpu; } /* Initialize each h/w resource */ @@ -727,16 +727,17 @@ static int power_init(void **data) *data = (void *)power_funcs; return 0; -err: - if (memory) - free(memory); + +err_gpu: if (gpu) free(gpu); +err_bus: if (bus) free(bus); +err_cpu: if (cpu) free(cpu); - +err_funcs: free(power_funcs); return ret; -- 2.7.4