Merge remote-tracking branch 'asoc/topic/wm8350' into asoc-next

3dfa480b · Mark Brown · eceff819 · 8a47ca95 · 3dfa480b
Commit 3dfa480b authored Feb 11, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

sound/soc/codecs/wm8350.c sound/soc/codecs/wm8350.c +4 -6

No files found.
--- 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,
-			schedule_delayed_work(&codec->dapm.delayed_work,
+				      msecs_to_jiffies(1));
-					      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,
-			schedule_delayed_work(&codec->dapm.delayed_work,
+				      msecs_to_jiffies(1));
-					      msecs_to_jiffies(1));
 		break;
 	}