Skip to content

Commit

Permalink
Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
torvalds committed Sep 27, 2012
2 parents e556cb3 + d0e12f3 commit 9a7c590
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm2000.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 9a7c590

Please sign in to comment.