ASoC: rt5663: cancel the work when system suspends
authorShuming Fan <shumingf@realtek.com>
Fri, 29 Dec 2023 09:29:22 +0000 (17:29 +0800)
committerMark Brown <broonie@kernel.org>
Fri, 29 Dec 2023 17:41:14 +0000 (17:41 +0000)
This patch makes sure that the workqueue is completed before the system suspends.

Signed-off-by: Shuming Fan <shumingf@realtek.com>
Link: https://lore.kernel.org/r/20231229092922.853-1-shumingf@realtek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt5663.c

index 77246f84de29f4ff96d7bf2eff201bfe62824e85..9550492605ac1eda7d56de33770d6d28f9a27ff3 100644 (file)
@@ -74,6 +74,7 @@ struct rt5663_priv {
        int pll_out;
 
        int jack_type;
+       unsigned int irq;
 };
 
 static const struct reg_sequence rt5663_patch_list[] = {
@@ -3186,6 +3187,12 @@ static int rt5663_suspend(struct snd_soc_component *component)
 {
        struct rt5663_priv *rt5663 = snd_soc_component_get_drvdata(component);
 
+       if (rt5663->irq)
+               disable_irq(rt5663->irq);
+
+       cancel_delayed_work_sync(&rt5663->jack_detect_work);
+       cancel_delayed_work_sync(&rt5663->jd_unplug_work);
+
        regcache_cache_only(rt5663->regmap, true);
        regcache_mark_dirty(rt5663->regmap);
 
@@ -3201,6 +3208,9 @@ static int rt5663_resume(struct snd_soc_component *component)
 
        rt5663_irq(0, rt5663);
 
+       if (rt5663->irq)
+               enable_irq(rt5663->irq);
+
        return 0;
 }
 #else
@@ -3686,6 +3696,7 @@ static int rt5663_i2c_probe(struct i2c_client *i2c)
                                __func__, ret);
                        goto err_enable;
                }
+               rt5663->irq = i2c->irq;
        }
 
        ret = devm_snd_soc_register_component(&i2c->dev,