66 lines
1.7 KiB
Diff
66 lines
1.7 KiB
Diff
From cc5bdd323dde6494623f3ffe3a5b887fa21cd375 Mon Sep 17 00:00:00 2001
|
|
From: Michael Walle <michael@walle.cc>
|
|
Date: Mon, 6 Feb 2023 13:43:48 +0000
|
|
Subject: [PATCH] nvmem: core: drop the removal of the cells in
|
|
nvmem_add_cells()
|
|
|
|
If nvmem_add_cells() fails, the whole nvmem_register() will fail
|
|
and the cells will then be removed anyway. This is a preparation
|
|
to introduce a nvmem_add_one_cell() which can then be used by
|
|
nvmem_add_cells().
|
|
|
|
This is then the same to what nvmem_add_cells_from_table() and
|
|
nvmem_add_cells_from_of() do.
|
|
|
|
Signed-off-by: Michael Walle <michael@walle.cc>
|
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
Link: https://lore.kernel.org/r/20230206134356.839737-15-srinivas.kandagatla@linaro.org
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/nvmem/core.c | 14 ++++----------
|
|
1 file changed, 4 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/nvmem/core.c
|
|
+++ b/drivers/nvmem/core.c
|
|
@@ -515,7 +515,7 @@ static int nvmem_add_cells(struct nvmem_
|
|
int ncells)
|
|
{
|
|
struct nvmem_cell_entry **cells;
|
|
- int i, rval;
|
|
+ int i, rval = 0;
|
|
|
|
cells = kcalloc(ncells, sizeof(*cells), GFP_KERNEL);
|
|
if (!cells)
|
|
@@ -525,28 +525,22 @@ static int nvmem_add_cells(struct nvmem_
|
|
cells[i] = kzalloc(sizeof(**cells), GFP_KERNEL);
|
|
if (!cells[i]) {
|
|
rval = -ENOMEM;
|
|
- goto err;
|
|
+ goto out;
|
|
}
|
|
|
|
rval = nvmem_cell_info_to_nvmem_cell_entry(nvmem, &info[i], cells[i]);
|
|
if (rval) {
|
|
kfree(cells[i]);
|
|
- goto err;
|
|
+ goto out;
|
|
}
|
|
|
|
nvmem_cell_entry_add(cells[i]);
|
|
}
|
|
|
|
+out:
|
|
/* remove tmp array */
|
|
kfree(cells);
|
|
|
|
- return 0;
|
|
-err:
|
|
- while (i--)
|
|
- nvmem_cell_entry_drop(cells[i]);
|
|
-
|
|
- kfree(cells);
|
|
-
|
|
return rval;
|
|
}
|
|
|