diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-03-04 11:51:29 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-03-04 11:51:29 +0100 |
commit | e02c4fd3142dfb9412531bbfabd510a2a7c6ea46 (patch) | |
tree | 61b64506b2c016e050f940a89d1ffd36b7c00fdf /sound/soc/codecs/wm8731.c | |
parent | tracing: Include irqflags headers from trace clock (diff) | |
parent | tracing: Fix warning in s_next of trace file ops (diff) | |
download | linux-e02c4fd3142dfb9412531bbfabd510a2a7c6ea46.tar.xz linux-e02c4fd3142dfb9412531bbfabd510a2a7c6ea46.zip |
Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'sound/soc/codecs/wm8731.c')
-rw-r--r-- | sound/soc/codecs/wm8731.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 3a497810f939..5a2619dbf283 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -456,6 +456,9 @@ static int wm8731_resume(struct platform_device *pdev) /* Sync reg_cache with the hardware */ for (i = 0; i < ARRAY_SIZE(wm8731_reg); i++) { + if (cache[i] == wm8731_reg[i]) + continue; + data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001); data[1] = cache[i] & 0x00ff; codec->hw_write(codec->control_data, data, 2); |