ALSA: intel8x0: Fix breakage at ac97 clock measurement
authorTakashi Iwai <tiwai@suse.de>
Thu, 8 Jul 2021 09:07:38 +0000 (11:07 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 8 Jul 2021 10:26:43 +0000 (12:26 +0200)
The recent workaround for the wild interrupts in commit c1f0616124c4
("ALSA: intel8x0: Don't update period unless prepared") leaded to a
regression, causing the interrupt storm during ac97 clock measurement
at the driver probe.  We need to handle the interrupt while the clock
measurement as well as the proper PCM streams.

Fixes: c1f0616124c4 ("ALSA: intel8x0: Don't update period unless prepared")
Reported-and-tested-by: Max Filippov <jcmvbkbc@gmail.com>
Tested-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/CAMo8BfKKMQkcsbOQaeEjq_FsJhdK=fn598dvh7YOcZshUSOH=g@mail.gmail.com
Link: https://lore.kernel.org/r/20210708090738.1569-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/intel8x0.c

index 2d1bfbc..df3ba5c 100644 (file)
@@ -694,7 +694,7 @@ static inline void snd_intel8x0_update(struct intel8x0 *chip, struct ichdev *ich
        int status, civ, i, step;
        int ack = 0;
 
-       if (!ichdev->prepared || ichdev->suspended)
+       if (!(ichdev->prepared || chip->in_measurement) || ichdev->suspended)
                return;
 
        spin_lock_irqsave(&chip->reg_lock, flags);