Merge tag 'mxs-dt-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt

[~andy/linux] / drivers / firmware / memmap.c

diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
index 0b5b5f619c7559d2b68284fdba6cf1a8e5c94dd7..e2e04b007e155954a405a53f7117000d03ccfc1e 100644 (file)
--- a/drivers/firmware/memmap.c
+++ b/drivers/firmware/memmap.c
@@ -114,12 +114,9 @@ static void __meminit release_firmware_map_entry(struct kobject *kobj)
                 * map_entries_bootmem here, and deleted from &map_entries in
                 * firmware_map_remove_entry().
                 */
-               if (firmware_map_find_entry(entry->start, entry->end,
-                   entry->type)) {
-                       spin_lock(&map_entries_bootmem_lock);
-                       list_add(&entry->list, &map_entries_bootmem);
-                       spin_unlock(&map_entries_bootmem_lock);
-               }
+               spin_lock(&map_entries_bootmem_lock);
+               list_add(&entry->list, &map_entries_bootmem);
+               spin_unlock(&map_entries_bootmem_lock);
 
                return;
        }