diff options
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/hda_codec.h | 2 | ||||
-rw-r--r-- | sound/pci/hda/hda_proc.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index dcd390b2bbaa..efc682888b31 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h | |||
@@ -78,7 +78,7 @@ enum { | |||
78 | #define AC_VERB_GET_BEEP_CONTROL 0x0f0a | 78 | #define AC_VERB_GET_BEEP_CONTROL 0x0f0a |
79 | #define AC_VERB_GET_EAPD_BTLENABLE 0x0f0c | 79 | #define AC_VERB_GET_EAPD_BTLENABLE 0x0f0c |
80 | #define AC_VERB_GET_DIGI_CONVERT_1 0x0f0d | 80 | #define AC_VERB_GET_DIGI_CONVERT_1 0x0f0d |
81 | #define AC_VERB_GET_DIGI_CONVERT_2 0x0f0e | 81 | #define AC_VERB_GET_DIGI_CONVERT_2 0x0f0e /* unused */ |
82 | #define AC_VERB_GET_VOLUME_KNOB_CONTROL 0x0f0f | 82 | #define AC_VERB_GET_VOLUME_KNOB_CONTROL 0x0f0f |
83 | /* f10-f1a: GPIO */ | 83 | /* f10-f1a: GPIO */ |
84 | #define AC_VERB_GET_GPIO_DATA 0x0f15 | 84 | #define AC_VERB_GET_GPIO_DATA 0x0f15 |
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index 5633f77f8f3b..1e5aff5c48d1 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c | |||
@@ -366,8 +366,6 @@ static void print_digital_conv(struct snd_info_buffer *buffer, | |||
366 | { | 366 | { |
367 | unsigned int digi1 = snd_hda_codec_read(codec, nid, 0, | 367 | unsigned int digi1 = snd_hda_codec_read(codec, nid, 0, |
368 | AC_VERB_GET_DIGI_CONVERT_1, 0); | 368 | AC_VERB_GET_DIGI_CONVERT_1, 0); |
369 | unsigned int digi2 = snd_hda_codec_read(codec, nid, 0, | ||
370 | AC_VERB_GET_DIGI_CONVERT_2, 0); | ||
371 | snd_iprintf(buffer, " Digital:"); | 369 | snd_iprintf(buffer, " Digital:"); |
372 | if (digi1 & AC_DIG1_ENABLE) | 370 | if (digi1 & AC_DIG1_ENABLE) |
373 | snd_iprintf(buffer, " Enabled"); | 371 | snd_iprintf(buffer, " Enabled"); |
@@ -386,7 +384,8 @@ static void print_digital_conv(struct snd_info_buffer *buffer, | |||
386 | if (digi1 & AC_DIG1_LEVEL) | 384 | if (digi1 & AC_DIG1_LEVEL) |
387 | snd_iprintf(buffer, " GenLevel"); | 385 | snd_iprintf(buffer, " GenLevel"); |
388 | snd_iprintf(buffer, "\n"); | 386 | snd_iprintf(buffer, "\n"); |
389 | snd_iprintf(buffer, " Digital category: 0x%x\n", digi2 & AC_DIG2_CC); | 387 | snd_iprintf(buffer, " Digital category: 0x%x\n", |
388 | (digi1 >> 8) & AC_DIG2_CC); | ||
390 | } | 389 | } |
391 | 390 | ||
392 | static const char *get_pwr_state(u32 state) | 391 | static const char *get_pwr_state(u32 state) |