Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d2b48f7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Check all inputs for is_active_nid_for_any() 

The is_active_nid_for_any() function in the generic parser is supposed
to check all connections from/to the given widget, but the current
code checks only the first input connection (index = 0).

This patch corrects the code to check all inputs by passing -1 to
index argument.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=102521


Cc: <stable@vger.kernel.org> [v4.1+]
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c7e69ae6

sound/pci/hda/hda_generic.c

+3 −2
Original line number Diff line number Diff line
@@ -671,7 +671,8 @@ static bool is_active_nid(struct hda_codec *codec, hda_nid_t nid, 
		}

		for (i = 0; i < path->depth; i++) {

			if (path->path[i] == nid) {

				if (dir == HDA_OUTPUT || path->idx[i] == idx)

				if (dir == HDA_OUTPUT || idx == -1 ||

				    path->idx[i] == idx)

					return true;

				break;

			}
@@ -682,7 +683,7 @@ static bool is_active_nid(struct hda_codec *codec, hda_nid_t nid, 


/* check whether the NID is referred by any active paths */

#define is_active_nid_for_any(codec, nid) \

	is_active_nid(codec, nid, HDA_OUTPUT, 0)

	is_active_nid(codec, nid, HDA_OUTPUT, -1)



/* get the default amp value for the target state */

static int get_amp_val_to_activate(struct hda_codec *codec, hda_nid_t nid,