From e25bc8bbc71b14c528460546a22bf4b97ddde1af Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 1 Jul 2009 18:05:27 +0200
Subject: [PATCH] --- yaml --- r: 157781 b: refs/heads/master c:
 b5025c50b5e817b3e509ad7e569f131b80d7c223 h: refs/heads/master i:   157779:
 b109861452722837908f325bb6572887916bf8a6 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/hda_codec.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index fbe50e07d610..dc4fd6a2a515 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d971c9fcf06d22663040570c3cfe08b137c4b2f
+refs/heads/master: b5025c50b5e817b3e509ad7e569f131b80d7c223
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
index 506f46ef0304..263d124de611 100644
--- a/trunk/sound/pci/hda/hda_codec.c
+++ b/trunk/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...