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

Commit 5930ca41 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] hda-codec - Allow opening SPDIF while analog dup mode 



Allow opening the dedicated SPDIF stream while running on analog dup
mode.  Then the SPDIF stream is once reset and assigned for the new
stream.  It's useful for exclusive SPDIF output like AC3/DTS.
(In the former version, you had to close once the analog stream to
 play the exclusive digital stream.)

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent f12ab1e0

sound/pci/hda/hda_codec.c

+3 −4
Original line number Diff line number Diff line
@@ -1916,10 +1916,9 @@ static void setup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid, 
int snd_hda_multi_out_dig_open(struct hda_codec *codec, struct hda_multi_out *mout)

{

	mutex_lock(&codec->spdif_mutex);

	if (mout->dig_out_used) {

		mutex_unlock(&codec->spdif_mutex);

		return -EBUSY; /* already being used */

	}

	if (mout->dig_out_used == HDA_DIG_ANALOG_DUP)

		/* already opened as analog dup; reset it once */

		snd_hda_codec_setup_stream(codec, mout->dig_out_nid, 0, 0, 0);

	mout->dig_out_used = HDA_DIG_EXCLUSIVE;

	mutex_unlock(&codec->spdif_mutex);

	return 0;