diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2019-10-28 11:58:03 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-10-28 12:44:28 +0100 |
| commit | ca58f55108fee41d87c9123f85ad4863e5de7f45 (patch) | |
| tree | bd838da18fb4139bdf8545613d12eb75733c70be /sound/pci/hda | |
| parent | Merge branch 'for-linus' into for-next (diff) | |
| download | linux-dev-ca58f55108fee41d87c9123f85ad4863e5de7f45.tar.xz linux-dev-ca58f55108fee41d87c9123f85ad4863e5de7f45.zip | |
ALSA: hda - Fix pending unsol events at shutdown
This is an alternative fix attemp for the issue reported in the commit
caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling") that was
reverted later due to regressions. Instead of tweaking the hardware
disablement order and the enforced irq flushing, do calling
cancel_work_sync() of the unsol work early enough, and explicitly
ignore the unsol events during the shutdown by checking the
bus->shutdown flag.
Fixes: caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://lore.kernel.org/r/s5h1ruxt9cz.wl-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda')
| -rw-r--r-- | sound/pci/hda/hda_bind.c | 4 | ||||
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_bind.c b/sound/pci/hda/hda_bind.c index 8272b50b8349..6a8564566375 100644 --- a/sound/pci/hda/hda_bind.c +++ b/sound/pci/hda/hda_bind.c @@ -43,6 +43,10 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev) { struct hda_codec *codec = container_of(dev, struct hda_codec, core); + /* ignore unsol events during shutdown */ + if (codec->bus->shutdown) + return; + if (codec->patch_ops.unsol_event) codec->patch_ops.unsol_event(codec, ev); } diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 2a9d87ff2e1c..121b20121dae 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1389,8 +1389,11 @@ static int azx_free(struct azx *chip) static int azx_dev_disconnect(struct snd_device *device) { struct azx *chip = device->device_data; + struct hdac_bus *bus = azx_bus(chip); chip->bus.shutdown = 1; + cancel_work_sync(&bus->unsol_work); + return 0; } |