From: Lars-Peter Clausen Date: Mon, 29 Dec 2014 17:43:36 +0000 (+0100) Subject: ALSA: Fix handling of multiple msbits constraints on the same runtime X-Git-Tag: firefly_0821_release~176^2~2367^2~101^2~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=19f52fae5adb7f2fd5b75251f9bd761f43a36476;p=firefly-linux-kernel-4.4.55.git ALSA: Fix handling of multiple msbits constraints on the same runtime If the sound card is made up of discrete components, each with their own driver (e.g. like in the ASoC case), we might end up with multiple msbits constraint rules installed. Currently this will result in msbits being set to whatever the last rule set it to. This patch updates the behavior of the rule to choose the minimum (other than zero) of all the installed rules. Signed-off-by: Lars-Peter Clausen Signed-off-by: Takashi Iwai --- diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index ec9e7866177f..b0c153534a29 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1300,7 +1300,7 @@ static int snd_pcm_hw_rule_msbits(struct snd_pcm_hw_params *params, unsigned int msbits = l >> 16; struct snd_interval *i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS); if (snd_interval_single(i) && snd_interval_value(i) == width) - params->msbits = msbits; + params->msbits = min_not_zero(params->msbits, msbits); return 0; }