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

Commit 0ac5501f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: change mask in snd_soc_get/put_volsw_sx to unsigned int"

parents 46251377 7a4ab19b

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;

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

	unsigned int mask = (1 << (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;

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

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

	int err = 0;

	unsigned int val, val_mask, val2 = 0;