---

yaml --- r: 34955 b: refs/heads/master c: 33ef765 h: refs/heads/master i: 34953: 9b8eac6 34951: c531bf3 v: v3
git-mirror · Sep 23, 2006 · 5cda9b8 · 5cda9b8
1 parent 8f33e78
commit 5cda9b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a922625126cc9bf593d801879a965b9f0eae6958
+refs/heads/master: 33ef765131bcf82bc5fca3f25d8313fa4df93ce0
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
@@ -1505,10 +1505,10 @@ int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
 				formats |= SNDRV_PCM_FMTBIT_S32_LE;
 				if (val & AC_SUPPCM_BITS_32)
 					bps = 32;
-				else if (val & AC_SUPPCM_BITS_20)
-					bps = 20;
 				else if (val & AC_SUPPCM_BITS_24)
 					bps = 24;
+				else if (val & AC_SUPPCM_BITS_20)
+					bps = 20;
 			}
 		}
 		else if (streams == AC_SUPFMT_FLOAT32) { /* should be exclusive */