Merge remote-tracking branch 'asoc/fix/wm8350' into tmp

[~andy/linux] / sound / soc / codecs / wm8350.c

diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 1db957d5476630a3053c85749b310026ffe0efcc..0e8b3aaf6c8d698e9dad1f25fdccbabc9ee9f1ef 100644 (file)
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -283,18 +283,16 @@ static int pga_event(struct snd_soc_dapm_widget *w,
                out->ramp = WM8350_RAMP_UP;
                out->active = 1;
 
-               if (!delayed_work_pending(&codec->dapm.delayed_work))
-                       schedule_delayed_work(&codec->dapm.delayed_work,
-                                             msecs_to_jiffies(1));
+               schedule_delayed_work(&codec->dapm.delayed_work,
+                                     msecs_to_jiffies(1));
                break;
 
        case SND_SOC_DAPM_PRE_PMD:
                out->ramp = WM8350_RAMP_DOWN;
                out->active = 0;
 
-               if (!delayed_work_pending(&codec->dapm.delayed_work))
-                       schedule_delayed_work(&codec->dapm.delayed_work,
-                                             msecs_to_jiffies(1));
+               schedule_delayed_work(&codec->dapm.delayed_work,
+                                     msecs_to_jiffies(1));
                break;
        }