summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2023-05-18 11:49:41 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2023-05-18 11:49:41 +1000
commit9bdc0fb5e195860cd4b1bd1a2e5371b74040f057 (patch)
tree6de573615f516a180faa8ba6ba33a96ff63d8995
parent3b012f0876c017eaf34b938dda5d76c69044d1b3 (diff)
parenta3c10035d12f5ec10915d5c00c2e8f7d7c066182 (diff)
downloadlinux-next-9bdc0fb5e195860cd4b1bd1a2e5371b74040f057.tar.gz
Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
-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 938c4f41b98c..5aae2f9bdd51 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -761,7 +761,8 @@ static int at24_probe(struct i2c_client *client)
pm_runtime_disable(dev);
if (!pm_runtime_status_suspended(dev))
regulator_disable(at24->vcc_reg);
- return PTR_ERR(at24->nvmem);
+ return dev_err_probe(dev, PTR_ERR(at24->nvmem),
+ "failed to register nvmem\n");
}
/*