diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 14:12:38 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 14:12:38 +0100 |
commit | 193b2f3f53690ca1f7409340dd9e63fcac1f6277 (patch) | |
tree | 04e2547417dffd397743d7174b9e80f366998a3b /sound/soc/codecs/cs42l51.c | |
parent | ASoC: Cleanup duplicated const (diff) | |
parent | ASoC: cs42l51: Fix off-by-one for reg_cache_size (diff) | |
download | linux-193b2f3f53690ca1f7409340dd9e63fcac1f6277.tar.xz linux-193b2f3f53690ca1f7409340dd9e63fcac1f6277.zip |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/codecs/cs42l51.c')
-rw-r--r-- | sound/soc/codecs/cs42l51.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index e378c4d52027..2f268f20268a 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c @@ -552,7 +552,7 @@ static int cs42l51_probe(struct snd_soc_codec *codec) static struct snd_soc_codec_driver soc_codec_device_cs42l51 = { .probe = cs42l51_probe, - .reg_cache_size = CS42L51_NUMREGS, + .reg_cache_size = CS42L51_NUMREGS + 1, .reg_word_size = sizeof(u8), }; |