From f0a135a7a423ddfe7741c14e6f7f88c450518bd3 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 7 Jun 2011 23:32:46 +0100 Subject: [PATCH] --- yaml --- r: 257553 b: refs/heads/master c: 780b75b4a0c3d6817cb2ef9493c1d1826cd6fc6b h: refs/heads/master i: 257551: ae57582f6920e30da0e10d3ca6caf20893a71a45 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm_hubs.c | 2 +- trunk/sound/soc/codecs/wm_hubs.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6a6859da8450..d9df015650f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9acf9fe5be653aa359c75d60fdaff03bf1ef471 +refs/heads/master: 780b75b4a0c3d6817cb2ef9493c1d1826cd6fc6b diff --git a/trunk/sound/soc/codecs/wm_hubs.c b/trunk/sound/soc/codecs/wm_hubs.c index ee218a80e587..4ebc131b7f36 100644 --- a/trunk/sound/soc/codecs/wm_hubs.c +++ b/trunk/sound/soc/codecs/wm_hubs.c @@ -194,7 +194,7 @@ static int wm8993_put_dc_servo(struct snd_kcontrol *kcontrol, /* If we're applying an offset correction then updating the * callibration would be likely to introduce further offsets. */ - if (hubs->dcs_codes) + if (hubs->dcs_codes || hubs->no_series_update) return ret; /* Only need to do this if the outputs are active */ diff --git a/trunk/sound/soc/codecs/wm_hubs.h b/trunk/sound/soc/codecs/wm_hubs.h index aeb58712a0e8..0d290d2740ec 100644 --- a/trunk/sound/soc/codecs/wm_hubs.h +++ b/trunk/sound/soc/codecs/wm_hubs.h @@ -24,6 +24,7 @@ struct wm_hubs_data { int dcs_readback_mode; int hp_startup_mode; int series_startup; + int no_series_update; bool class_w; u16 class_w_dcs;