summaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
authorWolfram Sang <wsa@kernel.org>2020-12-11 23:23:30 +0100
committerWolfram Sang <wsa@kernel.org>2020-12-11 23:23:30 +0100
commite977aaf899a6d3b3d6658da66e262b6e307ae3a2 (patch)
tree390360c6bb6a98753588fd247ed41d947138cfd6 /drivers/misc
parent0477e92881850d44910a7e94fc2c46f96faa131f (diff)
parent4e302c3b568eaf2aeebba804c07aba5d921a8c9e (diff)
Merge tag 'at24-fixes-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-current
at24 fixes for v5.10 - fix NVMEM name with custom AT24 device name
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/eeprom/at24.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 1c0a41803bb6..926408b41270 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -736,7 +736,6 @@ static int at24_probe(struct i2c_client *client)
nvmem_config.type = NVMEM_TYPE_EEPROM;
nvmem_config.dev = dev;
- nvmem_config.id = NVMEM_DEVID_AUTO;
nvmem_config.read_only = !writable;
nvmem_config.root_only = !(flags & AT24_FLAG_IRUGO);
nvmem_config.owner = THIS_MODULE;