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

Commit 72b2b4a8 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: Fix UBSAN warning at snd_soc_get/put_volsw_sx()"

parents 6f07dd79 503da192

sound/soc/soc-ops.c

+2 −2
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ int snd_soc_get_volsw_sx(struct snd_kcontrol *kcontrol, 
	unsigned int rshift = mc->rshift;

	int max = mc->max;

	int min = mc->min;

	unsigned int mask = (1 << (fls(min + max) - 1)) - 1;

	unsigned int mask = (1U << (fls(min + max) - 1)) - 1;

	unsigned int val;

	int ret;
@@ -424,7 +424,7 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, 
	unsigned int rshift = mc->rshift;

	int max = mc->max;

	int min = mc->min;

	unsigned int mask = (1 << (fls(min + max) - 1)) - 1;

	unsigned int mask = (1U << (fls(min + max) - 1)) - 1;

	int err = 0;

	unsigned int val, val_mask, val2 = 0;