From: Takashi Iwai Date: Thu, 29 Nov 2018 11:05:19 +0000 (+0100) Subject: ALSA: pcm: Fix interval evaluation with openmin/max X-Git-Tag: v3.18.129~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bceb7beeed4aed277b2ec8e0e86b5520a8626ea1;p=profile%2Fwearable%2Fplatform%2Fkernel%2Flinux-3.18-exynos7270.git ALSA: pcm: Fix interval evaluation with openmin/max commit 5363857b916c1f48027e9b96ee8be8376bf20811 upstream. As addressed in alsa-lib (commit b420056604f0), we need to fix the case where the evaluation of PCM interval "(x x+1]" leading to -EINVAL. After applying rules, such an interval may be translated as "(x x+1)". Fixes: ff2d6acdf6f1 ("ALSA: pcm: Fix snd_interval_refine first/last with open min/max") Cc: Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- diff --git a/include/sound/pcm_params.h b/include/sound/pcm_params.h index 6b1c78f..54c4d4e 100644 --- a/include/sound/pcm_params.h +++ b/include/sound/pcm_params.h @@ -272,11 +272,13 @@ static inline int snd_interval_empty(const struct snd_interval *i) static inline int snd_interval_single(const struct snd_interval *i) { return (i->min == i->max || - (i->min + 1 == i->max && i->openmax)); + (i->min + 1 == i->max && (i->openmin || i->openmax))); } static inline int snd_interval_value(const struct snd_interval *i) { + if (i->openmin && !i->openmax) + return i->max; return i->min; }