---

yaml --- r: 293211 b: refs/heads/master c: 278047f h: refs/heads/master i: 293209: 7911857 293207: d514a34 v: v3
git-mirror · Jan 21, 2012 · 08b3bcf · 08b3bcf
1 parent 75e43dd
commit 08b3bcf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09452f23eb01241fa19c2e99585af5e340a0961b
+refs/heads/master: 278047fd654dde7ed95c8604fcefeeacc5c0bb2b
diff --git a/trunk/sound/soc/soc-pcm.c b/trunk/sound/soc/soc-pcm.c
@@ -85,9 +85,11 @@ static void soc_pcm_apply_msb(struct snd_pcm_substream *substream,
 		return;
 
 	for (i = 0; i < ARRAY_SIZE(sample_sizes); i++) {
-		ret = snd_pcm_hw_constraint_msbits(substream->runtime,
-						   0, sample_sizes[i],
-						   bits);
+		if (bits >= sample_sizes[i])
+			continue;
+
+		ret = snd_pcm_hw_constraint_msbits(substream->runtime, 0,
+						   sample_sizes[i], bits);
 		if (ret != 0)
 			dev_warn(dai->dev,
 				 "Failed to set MSB %d/%d: %d\n",