Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01c377bf authored by Dan Carpenter's avatar Dan Carpenter Committed by Mark Brown
Browse files

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: afcc00b9 ('regmap: add 64-bit mode support')
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8b7663de

drivers/base/regmap/regmap.c

+3 −3
Original line number Diff line number Diff line
@@ -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