summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2020-03-13 16:32:28 +0100
committerWolfram Sang <wsa@the-dreams.de>2020-03-13 16:32:28 +0100
commit92bd1f2e1eed493a73a19012a3a7f1feed0883ff (patch)
treec4ce6dcc791fa96d2d3d989e752e45679bf7bac6
parent8daee952b4389729358665fb91949460641659d4 (diff)
parent58d6fee50e67bb1c69977f1a534ccb17bf58b0f1 (diff)
downloadlinux-92bd1f2e1eed493a73a19012a3a7f1feed0883ff.tar.gz
linux-92bd1f2e1eed493a73a19012a3a7f1feed0883ff.tar.bz2
linux-92bd1f2e1eed493a73a19012a3a7f1feed0883ff.zip
Merge tag 'at24-fixes-for-v5.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-current
at24 fixes for v5.6-rc6 - fix regulator underflow bug introduced during the v5.6 merge window
-rw-r--r--drivers/misc/eeprom/at24.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 031eb64549af..282c9ef68ed2 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -712,13 +712,14 @@ static int at24_probe(struct i2c_client *client)
* chip is functional.
*/
err = at24_read(at24, 0, &test_byte, 1);
- pm_runtime_idle(dev);
if (err) {
pm_runtime_disable(dev);
regulator_disable(at24->vcc_reg);
return -ENODEV;
}
+ pm_runtime_idle(dev);
+
if (writable)
dev_info(dev, "%u byte %s EEPROM, writable, %u bytes/write\n",
byte_len, client->name, at24->write_max);