aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-07-01 18:05:27 +0200
committerTakashi Iwai <tiwai@suse.de>2009-07-01 18:05:27 +0200
commitb5025c50b5e817b3e509ad7e569f131b80d7c223 (patch)
tree3d7ded230b3a6a2ab6958b5790533d246949b1f0 /sound
parent0d971c9fcf06d22663040570c3cfe08b137c4b2f (diff)
downloadkernel_samsung_espresso10-b5025c50b5e817b3e509ad7e569f131b80d7c223.zip
kernel_samsung_espresso10-b5025c50b5e817b3e509ad7e569f131b80d7c223.tar.gz
kernel_samsung_espresso10-b5025c50b5e817b3e509ad7e569f131b80d7c223.tar.bz2
ALSA: hda - Allow FLOAT PCM format
So far, the FLOAT PCM format is used only exclusivley set. But this can be a combination with other formats. This patch changes the parser to allow the FLOAT format in addition to other PCM formats. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_codec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 506f46e..263d124 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2690,11 +2690,11 @@ static int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
bps = 20;
}
}
- else if (streams == AC_SUPFMT_FLOAT32) {
- /* should be exclusive */
+ if (streams & AC_SUPFMT_FLOAT32) {
formats |= SNDRV_PCM_FMTBIT_FLOAT_LE;
bps = 32;
- } else if (streams == AC_SUPFMT_AC3) {
+ }
+ if (streams == AC_SUPFMT_AC3) {
/* should be exclusive */
/* temporary hack: we have still no proper support
* for the direct AC3 stream...