[PATCH AUTOSEL 4.19 120/146] nvmem: check the return value of nvmem_add_cells()

[Sasha Levin]

From: Bartosz Golaszewski <bgolaszew...@baylibre.com>

[ Upstream commit fa72d847d68d7833b77a4bef944cf2c5baf56f49 ]

This function can fail so check its return value in nvmem_register()
and act accordingly.

Signed-off-by: Bartosz Golaszewski <bgolaszew...@baylibre.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandaga...@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/nvmem/core.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index aa1657831b70..7c530c88b3fb 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -516,11 +516,17 @@ struct nvmem_device *nvmem_register(const struct 
nvmem_config *config)
                        goto err_device_del;
        }
 
-       if (config->cells)
-               nvmem_add_cells(nvmem, config->cells, config->ncells);
+       if (config->cells) {
+               rval = nvmem_add_cells(nvmem, config->cells, config->ncells);
+               if (rval)
+                       goto err_teardown_compat;
+       }
 
        return nvmem;
 
+err_teardown_compat:
+       if (config->compat)
+               device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom);
 err_device_del:
        device_del(&nvmem->dev);
 err_put_device:
-- 
2.17.1