diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-27 16:42:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-27 16:42:35 -0700 |
| commit | 9a7c590930c1d669a032c1b30cc8d95c069dc020 (patch) | |
| tree | 28a8f7ca0a7cdb36b6b5ef99bad4e7dd8253d22f | |
| parent | e556cb3e330d231628ccb5110c49811b618ad5b9 (diff) | |
| parent | d0e12f3ff3472cbd8f52d3c0e6ee07a841787c40 (diff) | |
| download | op-kernel-dev-9a7c590930c1d669a032c1b30cc8d95c069dc020.zip op-kernel-dev-9a7c590930c1d669a032c1b30cc8d95c069dc020.tar.gz | |
Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound
Pull ASoC update from Mark Brown:
"One small and obvious driver-specific fix.
Takashi is on vacation now so he asked me to send directly, it's a
pretty bad bug with low regression risk."
* tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound:
ASoC: wm2000: Correct register size
| -rw-r--r-- | sound/soc/codecs/wm2000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index 3fd5b29..a3acb7a 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -702,7 +702,7 @@ static bool wm2000_readable_reg(struct device *dev, unsigned int reg) } static const struct regmap_config wm2000_regmap = { - .reg_bits = 8, + .reg_bits = 16, .val_bits = 8, .max_register = WM2000_REG_IF_CTL, |
