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

Commit 2525fdc4 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] hda-intel - Add flush_scheduled_work() in snd_hda_codec_free() 



Added flush_scheduled_work() in snd_hda_codec_free() to make sure that
the all work is gone.  Also, optimized the condition to schedule the
delayed work in snd_hda_power_down().

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 983f8ae4

sound/pci/hda/hda_codec.c

+2 −1
Original line number Diff line number Diff line
@@ -525,6 +525,7 @@ static void snd_hda_codec_free(struct hda_codec *codec) 
		return;

#ifdef CONFIG_SND_HDA_POWER_SAVE

	cancel_delayed_work(&codec->power_work);

	flush_scheduled_work();

#endif

	list_del(&codec->list);

	codec->bus->caddr_tbl[codec->addr] = NULL;
@@ -2223,7 +2224,7 @@ void snd_hda_power_up(struct hda_codec *codec) 
void snd_hda_power_down(struct hda_codec *codec)

{

	--codec->power_count;

	if (!codec->power_on)

	if (!codec->power_on || codec->power_count)

		return;

	if (power_save)

		schedule_delayed_work(&codec->power_work,