ASoC: Fix merge errors with flush_scheduled_work() removal
delayed_work was moved to dapm in the commit
ce6120cca2
ASoC: Decouple DAPM from CODECs
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
20aeeb356b
commit
fdea0571dd
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue