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

ALSA: hda - Fix digital converter proc output 



AC_VERB_GET_DIGI_CONVERT_2 isn't actually implemented but reserved.
The whole SIC bits are returned from DIGI_CONVERT_1.

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

sound/pci/hda/hda_codec.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ enum { 
#define AC_VERB_GET_BEEP_CONTROL		0x0f0a

#define AC_VERB_GET_EAPD_BTLENABLE		0x0f0c

#define AC_VERB_GET_DIGI_CONVERT_1		0x0f0d

#define AC_VERB_GET_DIGI_CONVERT_2		0x0f0e

#define AC_VERB_GET_DIGI_CONVERT_2		0x0f0e /* unused */

#define AC_VERB_GET_VOLUME_KNOB_CONTROL		0x0f0f

/* f10-f1a: GPIO */

#define AC_VERB_GET_GPIO_DATA			0x0f15

sound/pci/hda/hda_proc.c

+2 −3
Original line number Diff line number Diff line
@@ -366,8 +366,6 @@ static void print_digital_conv(struct snd_info_buffer *buffer, 
{

	unsigned int digi1 = snd_hda_codec_read(codec, nid, 0,

						AC_VERB_GET_DIGI_CONVERT_1, 0);

	unsigned int digi2 = snd_hda_codec_read(codec, nid, 0,

						AC_VERB_GET_DIGI_CONVERT_2, 0);

	snd_iprintf(buffer, "  Digital:");

	if (digi1 & AC_DIG1_ENABLE)

		snd_iprintf(buffer, " Enabled");
@@ -386,7 +384,8 @@ static void print_digital_conv(struct snd_info_buffer *buffer, 
	if (digi1 & AC_DIG1_LEVEL)

		snd_iprintf(buffer, " GenLevel");

	snd_iprintf(buffer, "\n");

	snd_iprintf(buffer, "  Digital category: 0x%x\n", digi2 & AC_DIG2_CC);

	snd_iprintf(buffer, "  Digital category: 0x%x\n",

		    (digi1 >> 8) & AC_DIG2_CC);

}



static const char *get_pwr_state(u32 state)