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

Commit 66f493d9 authored by 이경택's avatar 이경택 Committed by Greg Kroah-Hartman
Browse files

ASoC: fix regwmask 



commit 0ab070917afdc93670c2d0ea02ab6defb6246a7c upstream.

If regwshift is 32 and the selected architecture compiles '<<' operator
for signed int literal into rotating shift, '1<<regwshift' became 1 and
it makes regwmask to 0x0.
The literal is set to unsigned long to get intended regwmask.

Signed-off-by: default avatarGyeongtaek Lee <gt82.lee@samsung.com>
Link: https://lore.kernel.org/r/001001d60665$db7af3e0$9270dba0$@samsung.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ee0e501

sound/soc/soc-ops.c

+2 −2
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ int snd_soc_get_xr_sx(struct snd_kcontrol *kcontrol, 
	unsigned int regbase = mc->regbase;

	unsigned int regcount = mc->regcount;

	unsigned int regwshift = component->val_bytes * BITS_PER_BYTE;

	unsigned int regwmask = (1<<regwshift)-1;

	unsigned int regwmask = (1UL<<regwshift)-1;

	unsigned int invert = mc->invert;

	unsigned long mask = (1UL<<mc->nbits)-1;

	long min = mc->min;
@@ -881,7 +881,7 @@ int snd_soc_put_xr_sx(struct snd_kcontrol *kcontrol, 
	unsigned int regbase = mc->regbase;

	unsigned int regcount = mc->regcount;

	unsigned int regwshift = component->val_bytes * BITS_PER_BYTE;

	unsigned int regwmask = (1<<regwshift)-1;

	unsigned int regwmask = (1UL<<regwshift)-1;

	unsigned int invert = mc->invert;

	unsigned long mask = (1UL<<mc->nbits)-1;

	long max = mc->max;