Merge tag 'v3.13-rc1' into asoc-arizona

Linux 3.13-rc1

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
index 4b02512e421c..5f487d776411 100644
--- a/include/linux/mtd/map.h
+++ b/include/linux/mtd/map.h
@@ -365,7 +365,7 @@ static inline map_word map_word_load_partial(struct map_info *map, map_word orig
                         bitpos = (map_bankwidth(map)-1-i)*8;
 #endif
                         orig.x[0] &= ~(0xff << bitpos);
-                        orig.x[0] |= buf[i-start] << bitpos;
+                        orig.x[0] |= (unsigned long)buf[i-start] << bitpos;
                 }
         }
         return orig;
@@ -384,7 +384,7 @@ static inline map_word map_word_ff(struct map_info *map)
 
         if (map_bankwidth(map) < MAP_FF_LIMIT) {
                 int bw = 8 * map_bankwidth(map);
-                r.x[0] = (1 << bw) - 1;
+                r.x[0] = (1UL << bw) - 1;
         } else {
                 for (i=0; i<map_words(map); i++)
                         r.x[i] = ~0UL;