evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Takashi Iwai 2007-08-15 22:18:22 +02:00 • committed by Jaroslav Kysela
parent 983f8ae406
commit 2525fdc42f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sound/pci/hda/hda_codec.c
View file

@ -525,6 +525,7 @@ static void snd_hda_codec_free(struct hda_codec *codec)
return; return;
#ifdef CONFIG_SND_HDA_POWER_SAVE #ifdef CONFIG_SND_HDA_POWER_SAVE
cancel_delayed_work(&codec->power_work); cancel_delayed_work(&codec->power_work);
flush_scheduled_work();
#endif #endif
list_del(&codec->list); list_del(&codec->list);
codec->bus->caddr_tbl[codec->addr] = NULL; 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) void snd_hda_power_down(struct hda_codec *codec)
{ {
--codec->power_count; --codec->power_count;
if (!codec->power_on) if (!codec->power_on || codec->power_count)
return; return;
if (power_save) if (power_save)
schedule_delayed_work(&codec->power_work, schedule_delayed_work(&codec->power_work,