summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHsin-Yi Wang <hsinyi@chromium.org>2021-04-20 21:30:50 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-14 13:50:59 +0200
commit2962484dfef8dbb7f9059822bc26ce8a04d0e47c (patch)
tree4078ab7c8948253b0ac45866495e5a2b85997b9a
parent0b0226be3a52dadd965644bc52a807961c2c26df (diff)
downloadlinux-stable-2962484dfef8dbb7f9059822bc26ce8a04d0e47c.tar.gz
linux-stable-2962484dfef8dbb7f9059822bc26ce8a04d0e47c.tar.bz2
linux-stable-2962484dfef8dbb7f9059822bc26ce8a04d0e47c.zip
misc: eeprom: at24: check suspend status before disable regulator
cd5676db0574 ("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: cd5676db0574 ("misc: eeprom: at24: support pm_runtime control") Cc: stable <stable@vger.kernel.org> Acked-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org> Link: https://lore.kernel.org/r/20210420133050.377209-1-hsinyi@chromium.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/eeprom/at24.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 926408b41270..7a6f01ace78a 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -763,7 +763,8 @@ 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);
- regulator_disable(at24->vcc_reg);
+ if (!pm_runtime_status_suspended(dev))
+ regulator_disable(at24->vcc_reg);
return PTR_ERR(at24->nvmem);
}
@@ -774,7 +775,8 @@ static int at24_probe(struct i2c_client *client)
err = at24_read(at24, 0, &test_byte, 1);
if (err) {
pm_runtime_disable(dev);
- regulator_disable(at24->vcc_reg);
+ if (!pm_runtime_status_suspended(dev))
+ regulator_disable(at24->vcc_reg);
return -ENODEV;
}