From f0182bb199796e314c459f5e57ed51cb083f5877 Mon Sep 17 00:00:00 2001 From: Dimitris Papastamos Date: Tue, 21 Sep 2010 15:03:26 +0100 Subject: [PATCH] --- yaml --- r: 210995 b: refs/heads/master c: d47372e852391d0c6553dfbc7c4c56b89b527e13 h: refs/heads/master i: 210993: dd484cc0d72ddeeb072e5b778bd85e652f53fb6f 210991: 0e783a3c37c024e9af1609fc528e6fb533d7bdbc v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-cache.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2b840fd7c34e..c130aca0a870 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbfa5184cc5f58627f08c7fad225424f565b439d +refs/heads/master: d47372e852391d0c6553dfbc7c4c56b89b527e13 diff --git a/trunk/sound/soc/soc-cache.c b/trunk/sound/soc/soc-cache.c index adbc68ce9050..15d2779074ef 100644 --- a/trunk/sound/soc/soc-cache.c +++ b/trunk/sound/soc/soc-cache.c @@ -203,8 +203,9 @@ static int snd_soc_8_16_write(struct snd_soc_codec *codec, unsigned int reg, data[1] = (value >> 8) & 0xff; data[2] = value & 0xff; - if (!snd_soc_codec_volatile_register(codec, reg)) - reg_cache[reg] = value; + if (!snd_soc_codec_volatile_register(codec, reg) + && reg < codec->driver->reg_cache_size) + reg_cache[reg] = value; if (codec->cache_only) { codec->cache_sync = 1;