diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-07-20 16:09:16 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-07-20 16:09:16 +0800 |
| commit | 204f956933371e80867606b2dc07aab06e82be12 (patch) | |
| tree | cc9ccfbeae074bfcefa9570b86ffd51c7287a45e /sound/core/timer.c | |
| parent | c863d9e9256315f6d91f866b95996e2c03052e12 (diff) | |
| parent | 1d508e233d21a7848cf54d7d03b40dac2d9ea873 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.07-android
Diffstat (limited to 'sound/core/timer.c')
| -rw-r--r-- | sound/core/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index c17d1df335d2..215d13e59853 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1051,8 +1051,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; } |