Commit 218b5ffc authored by Wu Fengguang's avatar Wu Fengguang Committed by Takashi Iwai

ALSA: hda - properly print ELD sample bits

Fix bugs on printing the ELD sample bits.
Signed-off-by: default avatarWu Fengguang <wfg@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 75a287d9
...@@ -397,7 +397,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a) ...@@ -397,7 +397,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a)
snd_print_pcm_rates(a->rates, buf, sizeof(buf)); snd_print_pcm_rates(a->rates, buf, sizeof(buf));
if (a->format == AUDIO_CODING_TYPE_LPCM) if (a->format == AUDIO_CODING_TYPE_LPCM)
snd_print_pcm_rates(a->sample_bits, buf2 + 8, sizeof(buf2 - 8)); snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2 - 8));
else if (a->max_bitrate) else if (a->max_bitrate)
snprintf(buf2, sizeof(buf2), snprintf(buf2, sizeof(buf2),
", max bitrate = %d", a->max_bitrate); ", max bitrate = %d", a->max_bitrate);
......
...@@ -120,7 +120,7 @@ void snd_print_pcm_bits(int pcm, char *buf, int buflen) ...@@ -120,7 +120,7 @@ void snd_print_pcm_bits(int pcm, char *buf, int buflen)
int i, j; int i, j;
for (i = 0, j = 0; i < ARRAY_SIZE(bits); i++) for (i = 0, j = 0; i < ARRAY_SIZE(bits); i++)
if (pcm & (1 << i)) if (pcm & (AC_SUPPCM_BITS_8 << i))
j += snprintf(buf + j, buflen - j, " %d", bits[i]); j += snprintf(buf + j, buflen - j, " %d", bits[i]);
buf[j] = '\0'; /* necessary when j == 0 */ buf[j] = '\0'; /* necessary when j == 0 */
...@@ -130,7 +130,6 @@ static void print_pcm_bits(struct snd_info_buffer *buffer, unsigned int pcm) ...@@ -130,7 +130,6 @@ static void print_pcm_bits(struct snd_info_buffer *buffer, unsigned int pcm)
{ {
char buf[SND_PRINT_BITS_ADVISED_BUFSIZE]; char buf[SND_PRINT_BITS_ADVISED_BUFSIZE];
pcm = (pcm >> 16) & 0xff;
snd_iprintf(buffer, " bits [0x%x]:", pcm); snd_iprintf(buffer, " bits [0x%x]:", pcm);
snd_print_pcm_bits(pcm, buf, sizeof(buf)); snd_print_pcm_bits(pcm, buf, sizeof(buf));
snd_iprintf(buffer, "%s\n", buf); snd_iprintf(buffer, "%s\n", buf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment