Commit 65987216 authored Dec 13, 2019 by Takashi Iwai Committed by Greg Kroah-Hartman Dec 31, 2019

ALSA: hda/ca0132 - Avoid endless loop

commit cb04fc3b6b076f67d228a0b7d096c69ad486c09c upstream.

Introduce a timeout to dspio_clear_response_queue() so that it won't
be caught in an endless loop even if the hardware doesn't respond
properly.

Fixes: a73d511c ("ALSA: hda/ca0132: Add unsol handler for DSP and jack detection")
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20191213085111.22855-3-tiwai@suse.de


Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 302dc1ae

sound/pci/hda/patch_ca0132.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1809,13 +1809,14 @@ struct scp_msg {

		static void dspio_clear_response_queue(struct hda_codec *codec)
		{
		unsigned long timeout = jiffies + msecs_to_jiffies(1000);
		unsigned int dummy = 0;
		int status = -1;
		int status;

		/* clear all from the response queue */
		do {
		status = dspio_read(codec, &dummy);
		} while (status == 0);
		} while (status == 0 && time_before(jiffies, timeout));
		}

		static int dspio_get_response_data(struct hda_codec *codec)