diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-18 09:17:13 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-18 09:17:13 -0400 |
| commit | 3b8c006b170fb6675a8dcbc224937a6eaa1c6d2e (patch) | |
| tree | 92025da0b13761b7a4ca25386c8f80712c73d19a | |
| parent | d6ed31534552484a82f41176df644277dbc59e48 (diff) | |
| parent | 64256ac6c2b6fb598fbe187a5503fd9dbb810374 (diff) | |
Merge remote-tracking branch 'asoc/fix/pcm1681' into asoc-linus
| -rw-r--r-- | sound/soc/codecs/pcm1681.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c index 651ce0923675..c91eba504f92 100644 --- a/sound/soc/codecs/pcm1681.c +++ b/sound/soc/codecs/pcm1681.c | |||
| @@ -270,7 +270,7 @@ MODULE_DEVICE_TABLE(of, pcm1681_dt_ids); | |||
| 270 | static const struct regmap_config pcm1681_regmap = { | 270 | static const struct regmap_config pcm1681_regmap = { |
| 271 | .reg_bits = 8, | 271 | .reg_bits = 8, |
| 272 | .val_bits = 8, | 272 | .val_bits = 8, |
| 273 | .max_register = ARRAY_SIZE(pcm1681_reg_defaults) + 1, | 273 | .max_register = 0x13, |
| 274 | .reg_defaults = pcm1681_reg_defaults, | 274 | .reg_defaults = pcm1681_reg_defaults, |
| 275 | .num_reg_defaults = ARRAY_SIZE(pcm1681_reg_defaults), | 275 | .num_reg_defaults = ARRAY_SIZE(pcm1681_reg_defaults), |
| 276 | .writeable_reg = pcm1681_writeable_reg, | 276 | .writeable_reg = pcm1681_writeable_reg, |