diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2019-08-21 14:35:16 +0300 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2019-08-21 14:35:16 +0300 |
commit | 880e4f93f94677dff02f795352ed4f069ee046b7 (patch) | |
tree | 339be7ef0256eb6586180f014a8bd8f2f3e7fa72 /drivers/infiniband/sw/siw/siw_main.c | |
parent | 19d17d935b29f30510874fd34e93357eea0daba2 (diff) | |
parent | d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 (diff) | |
download | linux-880e4f93f94677dff02f795352ed4f069ee046b7.tar.xz |
Merge tag 'v5.3-rc5' into devel
Linux 5.3-rc5
Diffstat (limited to 'drivers/infiniband/sw/siw/siw_main.c')
-rw-r--r-- | drivers/infiniband/sw/siw/siw_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/infiniband/sw/siw/siw_main.c b/drivers/infiniband/sw/siw/siw_main.c index f55c4e80aea4..05a92f997f60 100644 --- a/drivers/infiniband/sw/siw/siw_main.c +++ b/drivers/infiniband/sw/siw/siw_main.c @@ -160,10 +160,8 @@ static int siw_init_cpulist(void) out_err: siw_cpu_info.num_nodes = 0; - while (i) { + while (--i >= 0) kfree(siw_cpu_info.tx_valid_cpus[i]); - siw_cpu_info.tx_valid_cpus[i--] = NULL; - } kfree(siw_cpu_info.tx_valid_cpus); siw_cpu_info.tx_valid_cpus = NULL; @@ -612,6 +610,7 @@ static __init int siw_init_module(void) if (!siw_create_tx_threads()) { pr_info("siw: Could not start any TX thread\n"); + rv = -ENOMEM; goto out_error; } /* |