ASoC: rt5645: Use the mod_delayed_work instead of the queue_delayed_work and cancel_d...
authorOder Chiou <oder_chiou@realtek.com>
Tue, 10 Nov 2015 11:35:18 +0000 (19:35 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 16 Nov 2015 10:24:22 +0000 (10:24 +0000)
Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt5645.c

index 672fafd..4e81181 100644 (file)
@@ -572,14 +572,12 @@ static int rt5645_spk_put_volsw(struct snd_kcontrol *kcontrol,
        struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
        int ret;
 
-       cancel_delayed_work_sync(&rt5645->rcclock_work);
-
        regmap_update_bits(rt5645->regmap, RT5645_MICBIAS,
                RT5645_PWR_CLK25M_MASK, RT5645_PWR_CLK25M_PU);
 
        ret = snd_soc_put_volsw(kcontrol, ucontrol);
 
-       queue_delayed_work(system_power_efficient_wq, &rt5645->rcclock_work,
+       mod_delayed_work(system_power_efficient_wq, &rt5645->rcclock_work,
                msecs_to_jiffies(200));
 
        return ret;