dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

ALSA: asihpi - Use valid channel count in format enumeration.

Browse source 
Since introduction of mono and low latency modes, fixed channel count of 2
is not always valid.  Use reported max_channels instead.

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Eliot Blennerhassett 2011-12-22 13:38:50 +13:00 committed by Takashi Iwai
parent 8637bc94f6
commit c1d70dd9c4
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sound/pci/asihpi/asihpi.c
View file

@ -961,14 +961,12 @@ static void snd_card_asihpi_playback_format(struct snd_card_asihpi *asihpi,
for (format = HPI_FORMAT_PCM8_UNSIGNED; for (format = HPI_FORMAT_PCM8_UNSIGNED;
format <= HPI_FORMAT_PCM24_SIGNED; format++) { format <= HPI_FORMAT_PCM24_SIGNED; format++) {
err = hpi_format_create(&hpi_format, err = hpi_format_create(&hpi_format, asihpi->out_max_chans,
2, format, sample_rate, 128000, 0); format, sample_rate, 128000, 0);
if (!err) if (!err)
err = hpi_outstream_query_format(h_stream, err = hpi_outstream_query_format(h_stream, &hpi_format);
&hpi_format);
if (!err && (hpi_to_alsa_formats[format] != -1)) if (!err && (hpi_to_alsa_formats[format] != -1))
pcmhw->formats |= pcmhw->formats |= (1ULL << hpi_to_alsa_formats[format]);
(1ULL << hpi_to_alsa_formats[format]);
} }
} }
@ -1141,14 +1139,12 @@ static void snd_card_asihpi_capture_format(struct snd_card_asihpi *asihpi,
for (format = HPI_FORMAT_PCM8_UNSIGNED; for (format = HPI_FORMAT_PCM8_UNSIGNED;
format <= HPI_FORMAT_PCM24_SIGNED; format++) { format <= HPI_FORMAT_PCM24_SIGNED; format++) {
err = hpi_format_create(&hpi_format, 2, format, err = hpi_format_create(&hpi_format, asihpi->in_max_chans,
sample_rate, 128000, 0); format, sample_rate, 128000, 0);
if (!err) if (!err)
err = hpi_instream_query_format(h_stream, err = hpi_instream_query_format(h_stream, &hpi_format);
&hpi_format);
if (!err) if (!err)
pcmhw->formats |= pcmhw->formats |= (1ULL << hpi_to_alsa_formats[format]);
(1ULL << hpi_to_alsa_formats[format]);
} }
} }