1 files changed, 15 insertions, 3 deletions

diff --git a/sound/core/timer.c b/sound/core/timer.c
index fc144f43faa6..ad153149b231 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1702,9 +1702,21 @@ static int snd_timer_user_params(struct file *file,
                 return -EBADFD;
         if (copy_from_user(&params, _params, sizeof(params)))
                 return -EFAULT;
-        if (!(t->hw.flags & SNDRV_TIMER_HW_SLAVE) && params.ticks < 1) {
-                err = -EINVAL;
-                goto _end;
+        if (!(t->hw.flags & SNDRV_TIMER_HW_SLAVE)) {
+                u64 resolution;
+
+                if (params.ticks < 1) {
+                        err = -EINVAL;
+                        goto _end;
+                }
+
+                /* Don't allow resolution less than 1ms */
+                resolution = snd_timer_resolution(tu->timeri);
+                resolution *= params.ticks;
+                if (resolution < 1000000) {
+                        err = -EINVAL;
+                        goto _end;
+                }
         }
         if (params.queue_size > 0 &&
             (params.queue_size < 32 || params.queue_size > 1024)) {