Commit 58d6fee5 authored by Michael Auchter's avatar Michael Auchter Committed by Bartosz Golaszewski

misc: eeprom: at24: fix regulator underflow

The at24 driver attempts to read a byte from the device to validate that
it's actually present, and if not, disables the vcc regulator and
returns -ENODEV. However, between the read and the error handling path,
pm_runtime_idle() is called and invokes the driver's suspend callback,
which also disables the vcc regulator. This leads to an underflow of the
regulator enable count if the EEPROM is not present.

Move the pm_runtime_suspend() call to be after the error handling path
to resolve this.

Fixes: cd5676db ("misc: eeprom: at24: support pm_runtime control")
Signed-off-by: default avatarMichael Auchter <michael.auchter@ni.com>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
parent 2c523b34
...@@ -712,13 +712,14 @@ static int at24_probe(struct i2c_client *client) ...@@ -712,13 +712,14 @@ static int at24_probe(struct i2c_client *client)
* chip is functional. * chip is functional.
*/ */
err = at24_read(at24, 0, &test_byte, 1); err = at24_read(at24, 0, &test_byte, 1);
pm_runtime_idle(dev);
if (err) { if (err) {
pm_runtime_disable(dev); pm_runtime_disable(dev);
regulator_disable(at24->vcc_reg); regulator_disable(at24->vcc_reg);
return -ENODEV; return -ENODEV;
} }
pm_runtime_idle(dev);
if (writable) if (writable)
dev_info(dev, "%u byte %s EEPROM, writable, %u bytes/write\n", dev_info(dev, "%u byte %s EEPROM, writable, %u bytes/write\n",
byte_len, client->name, at24->write_max); byte_len, client->name, at24->write_max);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment