From: Eldad Zack Date: Mon, 22 Apr 2013 23:00:42 +0000 (+0200) Subject: ALSA: asihpi: add format support check in snd_card_asihpi_capture_formats X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=167d0a11d5feedd1f9cb9ae128ac543e97148eff;p=linux-beck.git ALSA: asihpi: add format support check in snd_card_asihpi_capture_formats Some Asihpi formats are not supported or invalid, and their mapping to ALSA format is set to -1. Before performing the format conversion into ALSA bitwise formats, add a consistency check for the requested format, as done in snd_card_asihpi_playback_formats(). Compile tested only. Signed-off-by: Eldad Zack Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c index 160cf830d327..fbc17203613c 100644 --- a/sound/pci/asihpi/asihpi.c +++ b/sound/pci/asihpi/asihpi.c @@ -1141,7 +1141,7 @@ static u64 snd_card_asihpi_capture_formats(struct snd_card_asihpi *asihpi, format, sample_rate, 128000, 0); if (!err) err = hpi_instream_query_format(h_stream, &hpi_format); - if (!err) + if (!err && (hpi_to_alsa_formats[format] != -1)) formats |= pcm_format_to_bits(hpi_to_alsa_formats[format]); } return formats;