diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-06 02:05:28 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-06 02:05:28 -0800 |
| commit | 0ac5501f23f6d456a1307f0b6eac4aec22fe8db2 (patch) | |
| tree | c5826699e19cb2dcc577ff5d3c32481e3ec22728 | |
| parent | 462513774f614a95a895dbbc86ad23c2fd17f8d7 (diff) | |
| parent | 7a4ab19b3177b0f77cb330f28a4a0bf485ccde17 (diff) | |
Merge "ASoC: change mask in snd_soc_get/put_volsw_sx to unsigned int"
| -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 c48d8c8d9766..92ccddea1fc5 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -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; |