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: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
1b5c6d035a
commit
92c01d8f4a
1 changed files with 3 additions and 1 deletions
|
@ -247,11 +247,13 @@ static inline int snd_interval_empty(const struct snd_interval *i)
|
||||||
static inline int snd_interval_single(const struct snd_interval *i)
|
static inline int snd_interval_single(const struct snd_interval *i)
|
||||||
{
|
{
|
||||||
return (i->min == i->max ||
|
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)
|
static inline int snd_interval_value(const struct snd_interval *i)
|
||||||
{
|
{
|
||||||
|
if (i->openmin && !i->openmax)
|
||||||
|
return i->max;
|
||||||
return i->min;
|
return i->min;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue