diff options
| author | Mark Brown <broonie@kernel.org> | 2018-01-12 15:28:46 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-12 15:28:46 +0300 |
| commit | 7c310f167a8e04f42d920912b6df39868fcfd742 (patch) | |
| tree | e13673323bcbe8c0a96da27bea8a3ff3e2f75c16 /sound/soc/soc-ops.c | |
| parent | a993056975d1d5696f5e065f4a2b9ac84229de65 (diff) | |
| parent | b9f902b7fd800214b5598a636ceb74bfe2db63be (diff) | |
| download | linux-7c310f167a8e04f42d920912b6df39868fcfd742.tar.xz | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound/soc/soc-ops.c')
| -rw-r--r-- | sound/soc/soc-ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 500f98c730b9..7144a51ddfa9 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -378,7 +378,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; @@ -423,7 +423,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; |