diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:51 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:51 +0000 |
| commit | 3dfa480b9ea7d292216cecbf976a8d36a9d1ba6e (patch) | |
| tree | 5c3c0e4cfef1f3a9d0fbe0367c7dd3ebbf9dad29 /sound | |
| parent | eceff8193312429349a5b5b49a48d9f8c764d9f5 (diff) | |
| parent | 8a47ca957a6bf86f81893edd9401b91c00be4848 (diff) | |
| download | linux-3.10-3dfa480b9ea7d292216cecbf976a8d36a9d1ba6e.tar.gz linux-3.10-3dfa480b9ea7d292216cecbf976a8d36a9d1ba6e.tar.bz2 linux-3.10-3dfa480b9ea7d292216cecbf976a8d36a9d1ba6e.zip | |
Merge remote-tracking branch 'asoc/topic/wm8350' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8350.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index fb92fb47d63..ec0efc1443b 100644 --- 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; } |