Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[cascardo/linux.git] / sound / core / pcm_lib.c

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 0032278..dfc2854 100644 (file)
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -1113,18 +1113,20 @@ int snd_interval_list(struct snd_interval *i, unsigned int count,
 
 EXPORT_SYMBOL(snd_interval_list);
 
-static int snd_interval_step(struct snd_interval *i, unsigned int min, unsigned int step)
+static int snd_interval_step(struct snd_interval *i, unsigned int step)
 {
        unsigned int n;
        int changed = 0;
-       n = (i->min - min) % step;
+       n = i->min % step;
        if (n != 0 || i->openmin) {
                i->min += step - n;
+               i->openmin = 0;
                changed = 1;
        }
-       n = (i->max - min) % step;
+       n = i->max % step;
        if (n != 0 || i->openmax) {
                i->max -= n;
+               i->openmax = 0;
                changed = 1;
        }
        if (snd_interval_checkempty(i)) {
@@ -1427,7 +1429,7 @@ static int snd_pcm_hw_rule_step(struct snd_pcm_hw_params *params,
                                struct snd_pcm_hw_rule *rule)
 {
        unsigned long step = (unsigned long) rule->private;
-       return snd_interval_step(hw_param_interval(params, rule->var), 0, step);
+       return snd_interval_step(hw_param_interval(params, rule->var), step);
 }
 
 /**