1 files changed, 15 insertions, 9 deletions

diff --git a/sound/core/timer.c b/sound/core/timer.c
index aa1b15c155d1..6469bedda2f3 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1019,8 +1019,8 @@ static int snd_timer_s_start(struct snd_timer * timer)
                 njiff += timer->sticks - priv->correction;
                 priv->correction = 0;
         }
-        priv->last_expires = priv->tlist.expires = njiff;
-        add_timer(&priv->tlist);
+        priv->last_expires = njiff;
+        mod_timer(&priv->tlist, njiff);
         return 0;
 }
 
@@ -1502,17 +1502,13 @@ static int snd_timer_user_ginfo(struct file *file,
         return err;
 }
 
-static int snd_timer_user_gparams(struct file *file,
-                                  struct snd_timer_gparams __user *_gparams)
+static int timer_set_gparams(struct snd_timer_gparams *gparams)
 {
-        struct snd_timer_gparams gparams;
         struct snd_timer *t;
         int err;
 
-        if (copy_from_user(&gparams, _gparams, sizeof(gparams)))
-                return -EFAULT;
         mutex_lock(&register_mutex);
-        t = snd_timer_find(&gparams.tid);
+        t = snd_timer_find(&gparams->tid);
         if (!t) {
                 err = -ENODEV;
                 goto _error;
@@ -1525,12 +1521,22 @@ static int snd_timer_user_gparams(struct file *file,
                 err = -ENOSYS;
                 goto _error;
         }
-        err = t->hw.set_period(t, gparams.period_num, gparams.period_den);
+        err = t->hw.set_period(t, gparams->period_num, gparams->period_den);
 _error:
         mutex_unlock(&register_mutex);
         return err;
 }
 
+static int snd_timer_user_gparams(struct file *file,
+                                  struct snd_timer_gparams __user *_gparams)
+{
+        struct snd_timer_gparams gparams;
+
+        if (copy_from_user(&gparams, _gparams, sizeof(gparams)))
+                return -EFAULT;
+        return timer_set_gparams(&gparams);
+}
+
 static int snd_timer_user_gstatus(struct file *file,
                                   struct snd_timer_gstatus __user *_gstatus)
 {