diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-09 13:00:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-09 13:00:22 +0100 |
| commit | a08a499aa3d85b605b5669cfc82b8e14232f7e91 (patch) | |
| tree | fd82da95552c996e9522a068ec77eae3a5ac6eec /sound/soc/codecs/wm8996.c | |
| parent | Merge branch 'topic/pcm-internal' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | Linux 3.3-rc3 (diff) | |
| download | linux-a08a499aa3d85b605b5669cfc82b8e14232f7e91.tar.xz linux-a08a499aa3d85b605b5669cfc82b8e14232f7e91.zip | |
Merge tag 'v3.3-rc3' as we've got several bugfixes in there which are
colliding annoyingly with development.
Linux 3.3-rc3
.. the number of the half-beast?
Conflicts:
sound/soc/codecs/wm5100.c
sound/soc/codecs/wm8994.c
Diffstat (limited to 'sound/soc/codecs/wm8996.c')
| -rw-r--r-- | sound/soc/codecs/wm8996.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 86f449ccf813..759ea69f0b44 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -108,7 +108,7 @@ static int wm8996_regulator_event_##n(struct notifier_block *nb, \ struct wm8996_priv *wm8996 = container_of(nb, struct wm8996_priv, \ disable_nb[n]); \ if (event & REGULATOR_EVENT_DISABLE) { \ - regcache_cache_only(wm8996->regmap, true); \ + regcache_mark_dirty(wm8996->regmap); \ } \ return 0; \ } |