commit c9f93e56de78a92e8dfefdb3ab7810b626294015
author Linux Build Service Account <lnxbuild@localhost> Wed Nov 09 01:18:04 2011 -0800
committer QuIC Gerrit Code Review <code-review@localhost> Wed Nov 09 01:18:04 2011 -0800
tree 39e7528d68a37ece29af1575a999f2e58b1f24d1
parent 59cf49895b6335ed442f50d9b456f50d43be6430
parent 3e2a610b6e4faff40a296ec81447bf5130194b4c

Merge "msm: qdsp6v2: Support 24 bit decoding for wma10pro" into msm-3.0

arch/arm/mach-msm/qdsp6v2/audio_wmapro.c

diff --git a/arch/arm/mach-msm/qdsp6v2/audio_wmapro.c b/arch/arm/mach-msm/qdsp6v2/audio_wmapro.c
index 37cbfac..98d1b30 100644
--- a/arch/arm/mach-msm/qdsp6v2/audio_wmapro.c
+++ b/arch/arm/mach-msm/qdsp6v2/audio_wmapro.c
@@ -109,7 +109,8 @@
 			rc = -EINVAL;
 			break;
 		}
-		if (wmapro_config->validbitspersample == 16) {
+		if ((wmapro_config->validbitspersample == 16) ||
+			(wmapro_config->validbitspersample == 24)) {
 			wmapro_cfg.valid_bits_per_sample =
 				wmapro_config->validbitspersample;
 		} else {