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

Commit c4a91e17 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next

parents 4308c9b0 c7cd0ef6

sound/pci/hda/hda_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -3102,7 +3102,7 @@ static int add_std_chmaps(struct hda_codec *codec) 
			struct snd_pcm_chmap *chmap;

			const struct snd_pcm_chmap_elem *elem;



			if (!pcm || pcm->own_chmap ||

			if (!pcm || !pcm->pcm || pcm->own_chmap ||

			    !hinfo->substreams)

				continue;

			elem = hinfo->chmap ? hinfo->chmap : snd_pcm_std_chmaps;

sound/pci/hda/hda_generic.c

+4 −7
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,
@@ -883,8 +884,7 @@ void snd_hda_activate_path(struct hda_codec *codec, struct nid_path *path, 
	struct hda_gen_spec *spec = codec->spec;

	int i;



	if (!enable)

		path->active = false;

	path->active = enable;



	/* make sure the widget is powered up */

	if (enable && (spec->power_down_unused || codec->power_save_node))
@@ -902,9 +902,6 @@ void snd_hda_activate_path(struct hda_codec *codec, struct nid_path *path, 
		if (has_amp_out(codec, path, i))

			activate_amp_out(codec, path, i, enable);

	}



	if (enable)

		path->active = true;

}

EXPORT_SYMBOL_GPL(snd_hda_activate_path);