aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-01-20 11:19:02 -0500
committerTakashi Iwai <tiwai@suse.de>2016-01-20 11:19:02 -0500
commit991f86d7ae4e1f8c15806e62f97af519e3cdd860 (patch)
treedf2d842a0b8d74e4fb9cff67ca2d05103a8a3049 /sound
parentbca8e988043e39483afd7872a2641f03ed7201a6 (diff)
ALSA: hda - Flush the pending probe work at remove
As HD-audio driver does deferred probe internally via workqueue, the driver might go into the mixed state doing both probe and remove when the module gets unloaded during the probe work. This eventually triggers an Oops, unsurprisingly. For avoiding this race, we just need to flush the pending probe work explicitly before actually starting the resource release. Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=960710 Cc: <stable@vger.kernel.org> # v3.17+ Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_intel.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 86bbc6307c4f..256e6cda218f 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2151,9 +2151,17 @@ i915_power_fail:
2151static void azx_remove(struct pci_dev *pci) 2151static void azx_remove(struct pci_dev *pci)
2152{ 2152{
2153 struct snd_card *card = pci_get_drvdata(pci); 2153 struct snd_card *card = pci_get_drvdata(pci);
2154 struct azx *chip;
2155 struct hda_intel *hda;
2156
2157 if (card) {
2158 /* flush the pending probing work */
2159 chip = card->private_data;
2160 hda = container_of(chip, struct hda_intel, chip);
2161 flush_work(&hda->probe_work);
2154 2162
2155 if (card)
2156 snd_card_free(card); 2163 snd_card_free(card);
2164 }
2157} 2165}
2158 2166
2159static void azx_shutdown(struct pci_dev *pci) 2167static void azx_shutdown(struct pci_dev *pci)