summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-12-12 21:47:46 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2020-12-12 21:47:46 +0100
commit5ee595d9079b94ee931287ce004d34886b7d3c24 (patch)
tree90ad150c4e851a11ca912da74dd28a32d7bbc100
parentMerge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff)
parentMerge tag 'at24-fixes-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
downloadlinux-5ee595d9079b94ee931287ce004d34886b7d3c24.tar.xz
linux-5ee595d9079b94ee931287ce004d34886b7d3c24.zip
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fix from Wolfram Sang: "Bugfix for the AT24 EEPROM driver" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: misc: eeprom: at24: fix NVMEM name with custom AT24 device name
-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;