xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: hda/ca0132 - Avoid endless loop

Browse Source 
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: a73d511c48 ("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>
This commit is contained in:
Takashi Iwai
2019-12-13 09:51:10 +01:00
parent 377bc0cfab
commit cb04fc3b6b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sound/pci/hda/patch_ca0132.c
View File

@@ -1809,13 +1809,14 @@ struct scp_msg {
static void dspio_clear_response_queue(struct hda_codec *codec) static void dspio_clear_response_queue(struct hda_codec *codec)
{ {
unsigned long timeout = jiffies + msecs_to_jiffies(1000);
unsigned int dummy = 0; unsigned int dummy = 0;
int status = -1; int status;
/* clear all from the response queue */ /* clear all from the response queue */
do { do {
status = dspio_read(codec, &dummy); 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) static int dspio_get_response_data(struct hda_codec *codec)