summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorWolfram Sang <wsa@kernel.org>2023-06-23 12:59:46 +0200
committerWolfram Sang <wsa@kernel.org>2023-06-23 12:59:46 +0200
commit6fb605c41d731d511b33045d0cd713d706970b6d (patch)
treef4480013d90535ac933475bcc3c13514ff092481 /drivers/misc
parenti2c: uniphier: Use devm_clk_get_enabled() (diff)
parenteeprom: at24: Use dev_err_probe for nvmem register failure (diff)
downloadlinux-6fb605c41d731d511b33045d0cd713d706970b6d.tar.xz
linux-6fb605c41d731d511b33045d0cd713d706970b6d.zip
Merge tag 'at24-updates-for-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-mergewindow
at24 updates for v6.5 - use dev_err_probe() where applicable
Diffstat (limited to 'drivers/misc')
-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");
}
/*