]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
nvmem: core: only change name to fram for current attribute
authorThomas Weißschuh <linux@weissschuh.net>
Fri, 28 Jun 2024 11:37:03 +0000 (12:37 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Jul 2024 14:37:51 +0000 (16:37 +0200)
bin_attr_nvmem_eeprom_compat is the template from which all future
compat attributes are created.
Changing it means to change all subsquent compat attributes, too.

Instead only use the "fram" name for the currently registered attribute.

Fixes: fd307a4ad332 ("nvmem: prepare basics for FRAM support")
Cc: stable@vger.kernel.org
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20240628113704.13742-4-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/nvmem/core.c

index e1ec3b7200d7b40c50a2a888bb74983dcfc0ee08..1285300ed239e9979e040f12835e5c9cc4052dbc 100644 (file)
@@ -396,10 +396,9 @@ static int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem,
        if (!config->base_dev)
                return -EINVAL;
 
-       if (config->type == NVMEM_TYPE_FRAM)
-               bin_attr_nvmem_eeprom_compat.attr.name = "fram";
-
        nvmem->eeprom = bin_attr_nvmem_eeprom_compat;
+       if (config->type == NVMEM_TYPE_FRAM)
+               nvmem->eeprom.attr.name = "fram";
        nvmem->eeprom.attr.mode = nvmem_bin_attr_get_umode(nvmem);
        nvmem->eeprom.size = nvmem->size;
 #ifdef CONFIG_DEBUG_LOCK_ALLOC