Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa72d847 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Greg Kroah-Hartman
Browse files

nvmem: check the return value of nvmem_add_cells() 



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

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f9fcb7e3

drivers/nvmem/core.c

+8 −2
Original line number Diff line number Diff line
@@ -512,11 +512,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: