[PATCH] [UBUNTU:sound/pci/hda/] Prefer 24-bit format instead of 20-bit for HDA

[crimsun at fungus.sh.nu]

From 3a7ed1400f31006b6b85ac6ea287f1ed416f8d4f Mon Sep 17 00:00:00 2001
From: Daniel T. Chen <crimsun at garnish.localdomain>
Date: Fri, 29 Sep 2006 20:39:53 -0400
Subject: [PATCH] [UBUNTU:sound/pci/hda/] Prefer 24-bit format instead of 20-bit for HDA

UpstreamStatus: Added in upstream alsa-kernel hg changeset:
		[cc3ee2ad070d] http://hg-mirror.alsa-project.org/alsa-kernel?cmd=changeset;node=cc3ee2ad070db578ee73f7eddd293ca10eaff555;style=raw

This commit changes the attempted format sequence to 32-bit,
24-bit, then 20-bit.

Suitable for application to both Dapper and Edgy linux-source.

Signed-off-by: Nicolas Graziano <nicolas.graziano at wanadoo.fr>
Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>
---
 sound/pci/hda/hda_codec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 4becd28..2e7344b 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1461,10 +1461,10 @@ int snd_hda_query_supported_pcm(struct h
 				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 */
-- 
1.4.1

-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:  0xC88ABDA3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20060929/48abceb2/attachment.sig>