Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

ASoC: Fix merge errors with flush_scheduled_work() removal

delayed_work was moved to dapm in the commit
ce6120cca2589ede530200c7cfe11ac9f144333c
    ASoC: Decouple DAPM from CODECs

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 14 years ago
parent
20aeeb356b
commit
fdea0571dd
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      sound/soc/codecs/wm8350.c
  2. 1 1
      sound/soc/codecs/wm8753.c

+ 1 - 1
sound/soc/codecs/wm8350.c
View File 

@@ -1643,7 +1643,7 @@ static int  wm8350_codec_remove(struct snd_soc_codec *codec)
 
 
 	/* if there was any work waiting then we run it now and
 
 	 * wait for its completion */
 
-	flush_delayed_work_sync(&codec->delayed_work);
 
+	flush_delayed_work_sync(&codec->dapm.delayed_work);
 
 
 	wm8350_set_bias_level(codec, SND_SOC_BIAS_OFF);

+ 1 - 1
sound/soc/codecs/wm8753.c
View File 

@@ -1587,7 +1587,7 @@ static int wm8753_probe(struct snd_soc_codec *codec)
 
 /* power down chip */
 
 static int wm8753_remove(struct snd_soc_codec *codec)
 
 {
 
-	flush_delayed_work_sync(&codec->delayed_work);
 
+	flush_delayed_work_sync(&codec->dapm.delayed_work);
 
 	wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
 
 	return 0;