Commit 2962484d authored by Hsin-Yi Wang's avatar Hsin-Yi Wang Committed by Greg Kroah-Hartman
Browse files

misc: eeprom: at24: check suspend status before disable regulator 



cd5676db ("misc: eeprom: at24: support pm_runtime control") disables
regulator in runtime suspend. If runtime suspend is called before
regulator disable, it will results in regulator unbalanced disabling.

Fixes: cd5676db ("misc: eeprom: at24: support pm_runtime control")
Cc: stable <stable@vger.kernel.org>
Acked-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: default avatarHsin-Yi Wang <hsinyi@chromium.org>
Link: https://lore.kernel.org/r/20210420133050.377209-1-hsinyi@chromium.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0b0226be

drivers/misc/eeprom/at24.c

+4 −2
Original line number Diff line number Diff line
@@ -763,6 +763,7 @@ static int at24_probe(struct i2c_client *client) 
	at24->nvmem = devm_nvmem_register(dev, &nvmem_config);

	if (IS_ERR(at24->nvmem)) {

		pm_runtime_disable(dev);

		if (!pm_runtime_status_suspended(dev))

			regulator_disable(at24->vcc_reg);

		return PTR_ERR(at24->nvmem);

	}
@@ -774,6 +775,7 @@ static int at24_probe(struct i2c_client *client) 
	err = at24_read(at24, 0, &test_byte, 1);

	if (err) {

		pm_runtime_disable(dev);

		if (!pm_runtime_status_suspended(dev))

			regulator_disable(at24->vcc_reg);

		return -ENODEV;

	}