summaryrefslogtreecommitdiff
path: root/sound/hda
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-10-14 16:54:25 +0300
committerTakashi Iwai <tiwai@suse.de>2021-10-14 16:54:30 +0300
commit6f00d1651b32f7f2951d9f299eb79b03c10186e3 (patch)
tree0cdab37749571b878d832d897d11402889516b89 /sound/hda
parent53451b6da8271905941eb1eb369db152c4bd92f2 (diff)
parentaef454b40288158b850aab13e3d2a8c406779401 (diff)
downloadlinux-6f00d1651b32f7f2951d9f299eb79b03c10186e3.tar.xz
Merge branch 'for-linus' into for-next
A back-merge of 5.15 branch into 5.16-devel branch for further development of USB and ALSA core stuff that depends on 5.15 fixes. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/hda')
-rw-r--r--sound/hda/hdac_controller.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c
index 062da7a7a586..f7bd6e2db085 100644
--- a/sound/hda/hdac_controller.c
+++ b/sound/hda/hdac_controller.c
@@ -421,8 +421,9 @@ int snd_hdac_bus_reset_link(struct hdac_bus *bus, bool full_reset)
if (!full_reset)
goto skip_reset;
- /* clear STATESTS */
- snd_hdac_chip_writew(bus, STATESTS, STATESTS_INT_MASK);
+ /* clear STATESTS if not in reset */
+ if (snd_hdac_chip_readb(bus, GCTL) & AZX_GCTL_RESET)
+ snd_hdac_chip_writew(bus, STATESTS, STATESTS_INT_MASK);
/* reset controller */
snd_hdac_bus_enter_link_reset(bus);