1 files changed, 7 insertions, 2 deletions

diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
index f6eb4332ac92..4b02512e421c 100644
--- a/include/linux/mtd/map.h
+++ b/include/linux/mtd/map.h
@@ -245,6 +245,7 @@ struct map_info {
         unsigned long pfow_base;
         unsigned long map_priv_1;
         unsigned long map_priv_2;
+        struct device_node *device_node;
         void *fldrv_priv;
         struct mtd_chip_driver *fldrv;
 };
@@ -328,7 +329,7 @@ static inline int map_word_bitsset(struct map_info *map, map_word val1, map_word
 
 static inline map_word map_word_load(struct map_info *map, const void *ptr)
 {
-        map_word r = {{0} };
+        map_word r;
 
         if (map_bankwidth_is_1(map))
                 r.x[0] = *(unsigned char *)ptr;
@@ -342,6 +343,8 @@ static inline map_word map_word_load(struct map_info *map, const void *ptr)
 #endif
         else if (map_bankwidth_is_large(map))
                 memcpy(r.x, ptr, map->bankwidth);
+        else
+                BUG();
 
         return r;
 }
@@ -391,7 +394,7 @@ static inline map_word map_word_ff(struct map_info *map)
 
 static inline map_word inline_map_read(struct map_info *map, unsigned long ofs)
 {
-        map_word uninitialized_var(r);
+        map_word r;
 
         if (map_bankwidth_is_1(map))
                 r.x[0] = __raw_readb(map->virt + ofs);
@@ -425,6 +428,8 @@ static inline void inline_map_write(struct map_info *map, const map_word datum,
 #endif
         else if (map_bankwidth_is_large(map))
                 memcpy_toio(map->virt+ofs, datum.x, map->bankwidth);
+        else
+                BUG();
         mb();
 }