summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2014-07-03 16:51:36 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-17 09:19:17 -0700
commit9e26a8159b3da6fc21e43c811ba147bce94814e7 (patch)
tree4a95e6ca5bb3d263f0ec3063fdf7379cca9ddbc7 /sound
parent7e2dc8d3b72a4a5f79d1d33b102dcdd69b09b426 (diff)
downloadlwn-9e26a8159b3da6fc21e43c811ba147bce94814e7.tar.gz
lwn-9e26a8159b3da6fc21e43c811ba147bce94814e7.zip
ASoC: adau1701: fix adau1701_reg_read()
commit 3ad80b828b2533f37c221e2df155774efd6ed814 upstream. Fix a long standing bug in the read register routing of adau1701. The bytes arrive in the buffer in big-endian, so the result has to be shifted before and-ing the bytes in the loop. Signed-off-by: Daniel Mack <zonque@gmail.com> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/adau1701.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c
index d71c59cf7bdd..370b742117ef 100644
--- a/sound/soc/codecs/adau1701.c
+++ b/sound/soc/codecs/adau1701.c
@@ -230,8 +230,10 @@ static int adau1701_reg_read(void *context, unsigned int reg,
*value = 0;
- for (i = 0; i < size; i++)
- *value |= recv_buf[i] << (i * 8);
+ for (i = 0; i < size; i++) {
+ *value <<= 8;
+ *value |= recv_buf[i];
+ }
return 0;
}