1 files changed, 26 insertions, 7 deletions

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index b05aa8e81303..b5b0cdc21d01 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -353,18 +353,27 @@ static int nvmem_cell_info_to_nvmem_cell(struct nvmem_device *nvmem,
         return 0;
 }
 
-static int nvmem_add_cells(struct nvmem_device *nvmem,
-                           const struct nvmem_config *cfg)
+/**
+ * nvmem_add_cells() - Add cell information to an nvmem device
+ *
+ * @nvmem: nvmem device to add cells to.
+ * @info: nvmem cell info to add to the device
+ * @ncells: number of cells in info
+ *
+ * Return: 0 or negative error code on failure.
+ */
+int nvmem_add_cells(struct nvmem_device *nvmem,
+                    const struct nvmem_cell_info *info,
+                    int ncells)
 {
         struct nvmem_cell **cells;
-        const struct nvmem_cell_info *info = cfg->cells;
         int i, rval;
 
-        cells = kcalloc(cfg->ncells, sizeof(*cells), GFP_KERNEL);
+        cells = kcalloc(ncells, sizeof(*cells), GFP_KERNEL);
         if (!cells)
                 return -ENOMEM;
 
-        for (i = 0; i < cfg->ncells; i++) {
+        for (i = 0; i < ncells; i++) {
                 cells[i] = kzalloc(sizeof(**cells), GFP_KERNEL);
                 if (!cells[i]) {
                         rval = -ENOMEM;
@@ -380,7 +389,7 @@ static int nvmem_add_cells(struct nvmem_device *nvmem,
                 nvmem_cell_add(cells[i]);
         }
 
-        nvmem->ncells = cfg->ncells;
+        nvmem->ncells = ncells;
         /* remove tmp array */
         kfree(cells);
 
@@ -393,6 +402,7 @@ err:
 
         return rval;
 }
+EXPORT_SYMBOL_GPL(nvmem_add_cells);
 
 /*
  * nvmem_setup_compat() - Create an additional binary entry in
@@ -509,7 +519,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
         }
 
         if (config->cells)
-                nvmem_add_cells(nvmem, config);
+                nvmem_add_cells(nvmem, config->cells, config->ncells);
 
         return nvmem;
 
@@ -559,6 +569,7 @@ static void devm_nvmem_release(struct device *dev, void *res)
  * nvmem_config.
  * Also creates an binary entry in /sys/bus/nvmem/devices/dev-name/nvmem
  *
+ * @dev: Device that uses the nvmem device.
  * @config: nvmem device configuration with which nvmem device is created.
  *
  * Return: Will be an ERR_PTR() on error or a valid pointer to nvmem_device
@@ -597,6 +608,7 @@ static int devm_nvmem_match(struct device *dev, void *res, void *data)
  * devm_nvmem_unregister() - Unregister previously registered managed nvmem
  * device.
  *
+ * @dev: Device that uses the nvmem device.
  * @nvmem: Pointer to previously registered nvmem device.
  *
  * Return: Will be an negative on error or a zero on success.
@@ -1107,6 +1119,8 @@ static void *nvmem_cell_prepare_write_buffer(struct nvmem_cell *cell,
 
                 /* setup the first byte with lsb bits from nvmem */
                 rc = nvmem_reg_read(nvmem, cell->offset, &v, 1);
+                if (rc)
+                        goto err;
                 *b++ |= GENMASK(bit_offset - 1, 0) & v;
 
                 /* setup rest of the byte if any */
@@ -1125,11 +1139,16 @@ static void *nvmem_cell_prepare_write_buffer(struct nvmem_cell *cell,
                 /* setup the last byte with msb bits from nvmem */
                 rc = nvmem_reg_read(nvmem,
                                     cell->offset + cell->bytes - 1, &v, 1);
+                if (rc)
+                        goto err;
                 *p |= GENMASK(7, (nbits + bit_offset) % BITS_PER_BYTE) & v;
 
         }
 
         return buf;
+err:
+        kfree(buf);
+        return ERR_PTR(rc);
 }
 
 /**