diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-10 10:17:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-10 10:17:45 +0100 |
| commit | 9c96f401e91a4358eb4a5e227c1521dea1c20127 (patch) | |
| tree | e8a0b78324510ba6133c58cc05b2cb2f3876745e /include/sound/pcm_params.h | |
| parent | Revert "sysctl: clean up nr_pdflush_threads leftover" (diff) | |
| parent | Linux 4.20-rc6 (diff) | |
| download | linux-9c96f401e91a4358eb4a5e227c1521dea1c20127.tar.xz linux-9c96f401e91a4358eb4a5e227c1521dea1c20127.zip | |
Merge 4.20-rc6 into tty-next
We want the TTY changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/sound/pcm_params.h')
| -rw-r--r-- | include/sound/pcm_params.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/pcm_params.h b/include/sound/pcm_params.h index 2dd37cada7c0..888a833d3b00 100644 --- a/include/sound/pcm_params.h +++ b/include/sound/pcm_params.h @@ -254,11 +254,13 @@ static inline int snd_interval_empty(const struct snd_interval *i) static inline int snd_interval_single(const struct snd_interval *i) { 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) { + if (i->openmin && !i->openmax) + return i->max; return i->min; } |