From 88bbdbc3baafc169babeddaf1f5e8a001b31005d Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Thu, 31 Jan 2013 21:06:34 +0400 Subject: [PATCH] --- yaml --- r: 360381 b: refs/heads/master c: 24dea0c9feccf699749f860fa2f4ccd84d30390d h: refs/heads/master i: 360379: 70518d46c461753c4494120811bbb79590c08716 v: v3 --- [refs] | 2 +- trunk/include/linux/mtd/map.h | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 38573f47d266..64c9e6acc2ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be0638d9e4795254e28e39eff61e38f47d240fd2 +refs/heads/master: 24dea0c9feccf699749f860fa2f4ccd84d30390d diff --git a/trunk/include/linux/mtd/map.h b/trunk/include/linux/mtd/map.h index 8b9bfd7dcaa3..4b02512e421c 100644 --- a/trunk/include/linux/mtd/map.h +++ b/trunk/include/linux/mtd/map.h @@ -329,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; @@ -343,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; } @@ -392,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); @@ -426,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(); }