Merge tag 'qcom-dt-for-3.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/galak...

[cascardo/linux.git] / drivers / firmware / memmap.c

diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
index 79f18e6..cc016c6 100644 (file)
--- a/drivers/firmware/memmap.c
+++ b/drivers/firmware/memmap.c
@@ -184,6 +184,9 @@ static int add_sysfs_fw_map_entry(struct firmware_map_entry *entry)
        static int map_entries_nr;
        static struct kset *mmap_kset;
 
+       if (entry->kobj.state_in_sysfs)
+               return -EEXIST;
+
        if (!mmap_kset) {
                mmap_kset = kset_create_and_add("memmap", NULL, firmware_kobj);
                if (!mmap_kset)