diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-03 18:08:59 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-03 18:08:59 +0000 |
| commit | 1c4b578aa4ea2ef98871dc8ad95acb1fa14f9bcd (patch) | |
| tree | a5be6de20a51086ac240059f18fb5889bc210845 /sound/soc/soc-core.c | |
| parent | dc1ccc48159d63eca5089e507c82c7d22ef60839 (diff) | |
| parent | ebff65473f56e6c30de928fd6a4f1ce5ae36e8c5 (diff) | |
| download | linux-stable-1c4b578aa4ea2ef98871dc8ad95acb1fa14f9bcd.tar.gz | |
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 4e53d87e881d..a66783e13a9c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3212,11 +3212,11 @@ int snd_soc_bytes_get(struct snd_kcontrol *kcontrol, break; case 2: ((u16 *)(&ucontrol->value.bytes.data))[0] - &= ~params->mask; + &= cpu_to_be16(~params->mask); break; case 4: ((u32 *)(&ucontrol->value.bytes.data))[0] - &= ~params->mask; + &= cpu_to_be32(~params->mask); break; default: return -EINVAL; |