diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-23 12:50:13 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-23 12:50:13 -0500 |
| commit | 3095b165a14b1a95eb500bcaf13ad725a27fe825 (patch) | |
| tree | fc63027bb6c613730d309f99767500faadef56ca /sound/soc/codecs | |
| parent | 4dc2ec09b80b32b54821f1776959740283efa5a2 (diff) | |
| parent | 48e3cbb3f67a27d9c2db075f3d0f700246c40caa (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/wm9712.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 0ac1215dcd9b..e237bf615129 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c | |||
| @@ -463,7 +463,8 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, | |||
| 463 | { | 463 | { |
| 464 | u16 *cache = codec->reg_cache; | 464 | u16 *cache = codec->reg_cache; |
| 465 | 465 | ||
| 466 | soc_ac97_ops.write(codec->ac97, reg, val); | 466 | if (reg < 0x7c) |
| 467 | soc_ac97_ops.write(codec->ac97, reg, val); | ||
| 467 | reg = reg >> 1; | 468 | reg = reg >> 1; |
| 468 | if (reg < (ARRAY_SIZE(wm9712_reg))) | 469 | if (reg < (ARRAY_SIZE(wm9712_reg))) |
| 469 | cache[reg] = val; | 470 | cache[reg] = val; |