Merge tag 'at24-fixes-for-v5.9-rc5' of... (0065ec00) · Commits · 戴 / test

Merge tag 'at24-fixes-for-v5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-current at24 fixes for v5.9-rc5 - delay registration of the nvmem provider until after power is enabled

drivers/misc/eeprom/at24.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -692,10 +692,6 @@ static int at24_probe(struct i2c_client *client)
		nvmem_config.word_size = 1;
		nvmem_config.size = byte_len;

		at24->nvmem = devm_nvmem_register(dev, &nvmem_config);
		if (IS_ERR(at24->nvmem))
		return PTR_ERR(at24->nvmem);

		i2c_set_clientdata(client, at24);

		err = regulator_enable(at24->vcc_reg);
		@@ -708,6 +704,13 @@ static int at24_probe(struct i2c_client *client)
		pm_runtime_set_active(dev);
		pm_runtime_enable(dev);

		at24->nvmem = devm_nvmem_register(dev, &nvmem_config);
		if (IS_ERR(at24->nvmem)) {
		pm_runtime_disable(dev);
		regulator_disable(at24->vcc_reg);
		return PTR_ERR(at24->nvmem);
		}

		/*
		* Perform a one-byte test read to verify that the
		* chip is functional.