From 08b3bcfa8cbbc017dd884e9af080c8a55e2a29af Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 19 Jan 2012 18:04:18 +0000 Subject: [PATCH] --- yaml --- r: 293211 b: refs/heads/master c: 278047fd654dde7ed95c8604fcefeeacc5c0bb2b h: refs/heads/master i: 293209: 79118577053db19f33014f5758994d9c9663d6f4 293207: d514a3478082d302c30650c17581cb89d7f18ede v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-pcm.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8d2e3902abc7..e528a3f51737 100644 --- 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 index 8bb17937d59a..326890148a26 100644 --- 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",