aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-07-06 21:49:35 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-07-06 21:49:35 +0100
commit4ec5c9693b46ab34976511cd43bf75c3a0fc704d (patch)
tree0d00f934a0c4544fa6430e8a38c2e2fb7a6ddba0 /sound/soc/codecs
parent1e30a5828e4e9e49fcc6e471bf0d99d4fd273ba4 (diff)
parent637a935aaba2f05e2178c9d1b714d7a2c36c8b44 (diff)
Merge branch 'for-2.6.31' into for-2.6.32
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm8753.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 370f7df0362..d80d414cfbb 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -79,7 +79,7 @@ static const u16 wm8753_reg[] = {
0x0097, 0x0097, 0x0000, 0x0004,
0x0000, 0x0083, 0x0024, 0x01ba,
0x0000, 0x0083, 0x0024, 0x01ba,
- 0x0000, 0x0000
+ 0x0000, 0x0000, 0x0000
};
/* codec private data */
@@ -1660,11 +1660,11 @@ static int wm8753_register(struct wm8753_priv *wm8753)
codec->set_bias_level = wm8753_set_bias_level;
codec->dai = wm8753_dai;
codec->num_dai = 2;
- codec->reg_cache_size = ARRAY_SIZE(wm8753->reg_cache);
+ codec->reg_cache_size = ARRAY_SIZE(wm8753->reg_cache) + 1;
codec->reg_cache = &wm8753->reg_cache;
codec->private_data = wm8753;
- memcpy(codec->reg_cache, wm8753_reg, sizeof(codec->reg_cache));
+ memcpy(codec->reg_cache, wm8753_reg, sizeof(wm8753->reg_cache));
INIT_DELAYED_WORK(&codec->delayed_work, wm8753_work);
ret = wm8753_reset(codec);