diff options
| author | Mark Brown <broonie@kernel.org> | 2018-10-01 12:14:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-10-01 12:14:51 +0100 |
| commit | c46dfa3b9768d6cd6c5fd562bdaa371a172a6c00 (patch) | |
| tree | d6a2f6732b08831b7036c5e15499aadc858a648f /sound/core/pcm_lib.c | |
| parent | 827ca3b0b92946f4dbf2b6178035163016a12cec (diff) | |
| parent | 46f9f7c3c326389d5765c28f120fead6cc068e67 (diff) | |
Merge tag 'v4.9.130' into linux-linaro-lsk-v4.9lsk-v4.9-18.09
This is the 4.9.130 stable release
# gpg: Signature made Sat 29 Sep 2018 11:07:36 BST
# gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E
# gpg: Good signature from "Greg Kroah-Hartman <gregkh@linuxfoundation.org>" [unknown]
# gpg: aka "Greg Kroah-Hartman (Linux kernel stable release signing key) <greg@kroah.com>" [unknown]
# gpg: aka "Greg Kroah-Hartman <gregkh@kernel.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 647F 2865 4894 E3BD 4571 99BE 38DB BDC8 6092 693E
Diffstat (limited to 'sound/core/pcm_lib.c')
| -rw-r--r-- | sound/core/pcm_lib.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 9306604f5070..f57a58ac7ae0 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -648,27 +648,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; } |