Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdea0571 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ASoC: Fix merge errors with flush_scheduled_work() removal 



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

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 20aeeb35

sound/soc/codecs/wm8350.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

sound/soc/codecs/wm8753.c

+1 −1
Original line number Diff line number Diff line
@@ -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;