diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 06:06:51 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 06:06:51 -0500 |
commit | 3dfa480b9ea7d292216cecbf976a8d36a9d1ba6e (patch) | |
tree | 5c3c0e4cfef1f3a9d0fbe0367c7dd3ebbf9dad29 | |
parent | eceff8193312429349a5b5b49a48d9f8c764d9f5 (diff) | |
parent | 8a47ca957a6bf86f81893edd9401b91c00be4848 (diff) |
Merge remote-tracking branch 'asoc/topic/wm8350' into asoc-next
-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 fb92fb47d636..ec0efc1443ba 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, | |||
283 | out->ramp = WM8350_RAMP_UP; | 283 | out->ramp = WM8350_RAMP_UP; |
284 | out->active = 1; | 284 | out->active = 1; |
285 | 285 | ||
286 | if (!delayed_work_pending(&codec->dapm.delayed_work)) | 286 | schedule_delayed_work(&codec->dapm.delayed_work, |
287 | schedule_delayed_work(&codec->dapm.delayed_work, | 287 | msecs_to_jiffies(1)); |
288 | msecs_to_jiffies(1)); | ||
289 | break; | 288 | break; |
290 | 289 | ||
291 | case SND_SOC_DAPM_PRE_PMD: | 290 | case SND_SOC_DAPM_PRE_PMD: |
292 | out->ramp = WM8350_RAMP_DOWN; | 291 | out->ramp = WM8350_RAMP_DOWN; |
293 | out->active = 0; | 292 | out->active = 0; |
294 | 293 | ||
295 | if (!delayed_work_pending(&codec->dapm.delayed_work)) | 294 | schedule_delayed_work(&codec->dapm.delayed_work, |
296 | schedule_delayed_work(&codec->dapm.delayed_work, | 295 | msecs_to_jiffies(1)); |
297 | msecs_to_jiffies(1)); | ||
298 | break; | 296 | break; |
299 | } | 297 | } |
300 | 298 | ||