diff options
author | Mark Brown | 2019-05-06 15:52:14 +0200 |
---|---|---|
committer | Mark Brown | 2019-05-06 15:52:14 +0200 |
commit | e2a23affe6a6a15111ae56edd7e4f3c9673ef201 (patch) | |
tree | a69d90bfe04ff687e8ccde00ddac9aea357e33e6 /sound | |
parent | Merge branch 'regulator-5.1' into regulator-linus (diff) | |
parent | regulator: core: simplify return value on suported_voltage (diff) | |
download | kernel-qcow2-linux-e2a23affe6a6a15111ae56edd7e4f3c9673ef201.tar.gz kernel-qcow2-linux-e2a23affe6a6a15111ae56edd7e4f3c9673ef201.tar.xz kernel-qcow2-linux-e2a23affe6a6a15111ae56edd7e4f3c9673ef201.zip |
Merge branch 'regulator-5.2' into regulator-next
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/ab8500-codec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index 87616b126018..19e7f0333c2a 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c @@ -1062,10 +1062,10 @@ static void anc_iir(struct snd_soc_component *component, unsigned int bnk, snd_soc_component_update_bits(component, AB8500_ANCCONF1, BIT(AB8500_ANCCONF1_ANCIIRINIT), BIT(AB8500_ANCCONF1_ANCIIRINIT)); - usleep_range(AB8500_ANC_SM_DELAY, AB8500_ANC_SM_DELAY); + usleep_range(AB8500_ANC_SM_DELAY, AB8500_ANC_SM_DELAY*2); snd_soc_component_update_bits(component, AB8500_ANCCONF1, BIT(AB8500_ANCCONF1_ANCIIRINIT), 0); - usleep_range(AB8500_ANC_SM_DELAY, AB8500_ANC_SM_DELAY); + usleep_range(AB8500_ANC_SM_DELAY, AB8500_ANC_SM_DELAY*2); } else { snd_soc_component_update_bits(component, AB8500_ANCCONF1, BIT(AB8500_ANCCONF1_ANCIIRUPDATE), |