2020-04-28 13:51:34

by Wei Yongjun

[permalink] [raw]
Subject: [PATCH -next] stm class: dummy_stm: fix error return code in dummy_stm_init()

Fix to return error code -ENOMEM from the error handling case instead
of 0(ret can be overwritted to 0 in for loop).

Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/hwtracing/stm/dummy_stm.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/hwtracing/stm/dummy_stm.c b/drivers/hwtracing/stm/dummy_stm.c
index 38528ffdc0b3..36d32e7afb35 100644
--- a/drivers/hwtracing/stm/dummy_stm.c
+++ b/drivers/hwtracing/stm/dummy_stm.c
@@ -68,7 +68,7 @@ static int dummy_stm_link(struct stm_data *data, unsigned int master,

static int dummy_stm_init(void)
{
- int i, ret = -ENOMEM;
+ int i, ret;

if (nr_dummies < 0 || nr_dummies > DUMMY_STM_MAX)
return -EINVAL;
@@ -80,8 +80,10 @@ static int dummy_stm_init(void)

for (i = 0; i < nr_dummies; i++) {
dummy_stm[i].name = kasprintf(GFP_KERNEL, "dummy_stm.%d", i);
- if (!dummy_stm[i].name)
+ if (!dummy_stm[i].name) {
+ ret = -ENOMEM;
goto fail_unregister;
+ }

dummy_stm[i].sw_start = master_min;
dummy_stm[i].sw_end = master_max;