|
@@ -627,27 +627,33 @@ EXPORT_SYMBOL(snd_interval_refine);
|
|
|
|
|
|
static int snd_interval_refine_first(struct snd_interval *i)
|
|
|
{
|
|
|
+ const unsigned int last_max = i->max;
|
|
|
+
|
|
|
if (snd_BUG_ON(snd_interval_empty(i)))
|
|
|
return -EINVAL;
|
|
|
if (snd_interval_single(i))
|
|
|
return 0;
|
|
|
i->max = i->min;
|
|
|
- i->openmax = i->openmin;
|
|
|
- if (i->openmax)
|
|
|
+ if (i->openmin)
|
|
|
i->max++;
|
|
|
+ /* only exclude max value if also excluded before refine */
|
|
|
+ i->openmax = (i->openmax && i->max >= last_max);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
static int snd_interval_refine_last(struct snd_interval *i)
|
|
|
{
|
|
|
+ const unsigned int last_min = i->min;
|
|
|
+
|
|
|
if (snd_BUG_ON(snd_interval_empty(i)))
|
|
|
return -EINVAL;
|
|
|
if (snd_interval_single(i))
|
|
|
return 0;
|
|
|
i->min = i->max;
|
|
|
- i->openmin = i->openmax;
|
|
|
- if (i->openmin)
|
|
|
+ if (i->openmax)
|
|
|
i->min--;
|
|
|
+ /* only exclude min value if also excluded before refine */
|
|
|
+ i->openmin = (i->openmin && i->min <= last_min);
|
|
|
return 1;
|
|
|
}
|
|
|
|