iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: hda - Cancel probe work instead of flush at remove

Browse Source 
The commit [991f86d7ae: ALSA: hda - Flush the pending probe work at
remove] introduced the sync of async probe work at remove for fixing
the race.  However, this may lead to another hangup when the module
removal is performed quickly before starting the probe work, because
it issues flush_work() and it's blocked forever.

The workaround is to use cancel_work_sync() instead of flush_work()
there.

Fixes: 991f86d7ae ('ALSA: hda - Flush the pending probe work at remove')
Cc: <stable@vger.kernel.org> # v3.17+
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2016-02-15 16:37:24 +01:00
parent d99a36f472
commit 0b8c82190c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/pci/hda/hda_intel.c
View File

@ -2168,10 +2168,10 @@ static void azx_remove(struct pci_dev *pci)
struct hda_intel *hda; struct hda_intel *hda;
if (card) { if (card) {
/* flush the pending probing work */ /* cancel the pending probing work */
chip = card->private_data; chip = card->private_data;
hda = container_of(chip, struct hda_intel, chip); hda = container_of(chip, struct hda_intel, chip);
flush_work(&hda->probe_work); cancel_work_sync(&hda->probe_work);
snd_card_free(card); snd_card_free(card);
} }