diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-07-17 22:26:54 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-07-17 22:27:03 +0200 |
| commit | ed6b83d2d190463c46a5e4a5b04c49d885c56439 (patch) | |
| tree | 71a6fa7d43f91ad7256e963c18bec0e9e13f844e /sound/core/timer.c | |
| parent | 7373c2a99abf2b11b5e8a226071331c0176253ff (diff) | |
| parent | 39675f7a7c7e7702f7d5341f1e0d01db746543a0 (diff) | |
| download | linux-ed6b83d2d190463c46a5e4a5b04c49d885c56439.tar.gz | |
Merge branch 'for-linus' into for-next
Back-merge for further cleanup / improvements on rawmidi and HD-audio
stuff.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/timer.c')
| -rw-r--r-- | sound/core/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 665089c45560..b6f076bbc72d 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1520,7 +1520,7 @@ static int snd_timer_user_next_device(struct snd_timer_id __user *_tid) } else { if (id.subdevice < 0) id.subdevice = 0; - else + else if (id.subdevice < INT_MAX) id.subdevice++; } } |