Merge series "ASoC: topology: fix error handling flow" from Pierre-Louis Bossart...

[sfrench/cifs-2.6.git] / sound / soc / codecs / rt5682.c

diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c
index e9514c81b9ba444ff87cd7eaffd1ccb3d944a173..de40b6cd16cf23ae02814fec2b8bc1762904e85d 100644 (file)
--- a/sound/soc/codecs/rt5682.c
+++ b/sound/soc/codecs/rt5682.c
@@ -992,16 +992,17 @@ static int rt5682_set_jack_detect(struct snd_soc_component *component,
 
        rt5682->hs_jack = hs_jack;
 
-       if (!rt5682->is_sdw) {
-               if (!hs_jack) {
-                       regmap_update_bits(rt5682->regmap, RT5682_IRQ_CTRL_2,
-                               RT5682_JD1_EN_MASK, RT5682_JD1_DIS);
-                       regmap_update_bits(rt5682->regmap, RT5682_RC_CLK_CTRL,
-                               RT5682_POW_JDH | RT5682_POW_JDL, 0);
-                       cancel_delayed_work_sync(&rt5682->jack_detect_work);
-                       return 0;
-               }
+       if (!hs_jack) {
+               regmap_update_bits(rt5682->regmap, RT5682_IRQ_CTRL_2,
+                       RT5682_JD1_EN_MASK, RT5682_JD1_DIS);
+               regmap_update_bits(rt5682->regmap, RT5682_RC_CLK_CTRL,
+                       RT5682_POW_JDH | RT5682_POW_JDL, 0);
+               cancel_delayed_work_sync(&rt5682->jack_detect_work);
 
+               return 0;
+       }
+
+       if (!rt5682->is_sdw) {
                switch (rt5682->pdata.jd_src) {
                case RT5682_JD1:
                        snd_soc_component_update_bits(component,