regmap: shift wrapping bugs in 64 bit code

We should cast these to 64bit so that we don't truncate away the high
bits.

Fixes: afcc00b91f18 ('regmap: add 64-bit mode support')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index a0d30a0fd8cff439a5ce8a0895f856967f7879b6..9c167e73fdcd052f3468af4ba4393b26401ce783 100644 (file)
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -250,20 +250,20 @@ static void regmap_format_64_be(void *buf, unsigned int val, unsigned int shift)
 {
        __be64 *b = buf;
 
-       b[0] = cpu_to_be64(val << shift);
+       b[0] = cpu_to_be64((u64)val << shift);
 }
 
 static void regmap_format_64_le(void *buf, unsigned int val, unsigned int shift)
 {
        __le64 *b = buf;
 
-       b[0] = cpu_to_le64(val << shift);
+       b[0] = cpu_to_le64((u64)val << shift);
 }
 
 static void regmap_format_64_native(void *buf, unsigned int val,
                                    unsigned int shift)
 {
-       *(u64 *)buf = val << shift;
+       *(u64 *)buf = (u64)val << shift;
 }
 #endif