Commit 92bd1f2e authored by Wolfram Sang's avatar Wolfram Sang

Merge tag 'at24-fixes-for-v5.6-rc6' of...

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
parents 8daee952 58d6fee5
...@@ -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