[Intel-gfx] [PATCH] Revert "ALSA: pcm: Fix snd_interval_refine first/last with open min/max"
Chris Wilson
chris at chris-wilson.co.uk
Wed Jul 11 20:39:09 UTC 2018
This reverts commit ff2d6acdf6f13d9f8fdcd890844c6d7535ac1f10.
---
sound/core/pcm_lib.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 4e6110d778bd..5736860f325b 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -627,33 +627,27 @@ 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;
- if (i->openmin)
+ i->openmax = i->openmin;
+ if (i->openmax)
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;
- if (i->openmax)
+ i->openmin = i->openmax;
+ if (i->openmin)
i->min--;
- /* only exclude min value if also excluded before refine */
- i->openmin = (i->openmin && i->min <= last_min);
return 1;
}
--
2.18.0
More information about the Intel-gfx
mailing list