提交 db3546d5 编写于 作者: M Michael Walle 提交者: Greg Kroah-Hartman

nvmem: core: fix cell removal on error

nvmem_add_cells() could return an error after some cells are already
added to the provider. In this case, the added cells are not removed.
Remove any registered cells if nvmem_add_cells() fails.

Fixes: fa72d847 ("nvmem: check the return value of nvmem_add_cells()")
Cc: stable@vger.kernel.org
Signed-off-by: NMichael Walle <michael@walle.cc>
Signed-off-by: NSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230127104015.23839-9-srinivas.kandagatla@linaro.orgSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 edcf2fb6
...@@ -847,7 +847,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) ...@@ -847,7 +847,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
if (config->cells) { if (config->cells) {
rval = nvmem_add_cells(nvmem, config->cells, config->ncells); rval = nvmem_add_cells(nvmem, config->cells, config->ncells);
if (rval) if (rval)
goto err_teardown_compat; goto err_remove_cells;
} }
rval = nvmem_add_cells_from_table(nvmem); rval = nvmem_add_cells_from_table(nvmem);
...@@ -870,7 +870,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) ...@@ -870,7 +870,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
err_remove_cells: err_remove_cells:
nvmem_device_remove_all_cells(nvmem); nvmem_device_remove_all_cells(nvmem);
err_teardown_compat:
if (config->compat) if (config->compat)
nvmem_sysfs_remove_compat(nvmem, config); nvmem_sysfs_remove_compat(nvmem, config);
err_put_device: err_put_device:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册