OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'char-misc-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[tomoyo/tomoyo-test1.git]
/
drivers
/
misc
/
eeprom
/
at24.c
diff --git
a/drivers/misc/eeprom/at24.c
b/drivers/misc/eeprom/at24.c
index
d93fbb1
..
dbbf7db
100644
(file)
--- 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");
}
/*