Ver Fonte

ASoC: core: Use consistent byte ordering in snd_soc_bytes_get

snd_soc_bytes_put treats the data in the binary control as big endian
words, however snd_soc_bytes_get uses the endian of the host machine.
This causes the two functions to be inconsistant with how the mask is
applied on little endian machines.

This patch applies the big_endian format used in snd_soc_bytes_put to
snd_soc_bytes_get.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Charles Keepax há 11 anos atrás
pai
commit
8f1ec93ae9
1 ficheiros alterados com 2 adições e 2 exclusões
  1. 2 2
      sound/soc/soc-core.c

+ 2 - 2
sound/soc/soc-core.c

@@ -3212,11 +3212,11 @@ int snd_soc_bytes_get(struct snd_kcontrol *kcontrol,
 			break;
 			break;
 		case 2:
 		case 2:
 			((u16 *)(&ucontrol->value.bytes.data))[0]
 			((u16 *)(&ucontrol->value.bytes.data))[0]
-				&= ~params->mask;
+				&= cpu_to_be16(~params->mask);
 			break;
 			break;
 		case 4:
 		case 4:
 			((u32 *)(&ucontrol->value.bytes.data))[0]
 			((u32 *)(&ucontrol->value.bytes.data))[0]
-				&= ~params->mask;
+				&= cpu_to_be32(~params->mask);
 			break;
 			break;
 		default:
 		default:
 			return -EINVAL;
 			return -EINVAL;