diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-23 17:04:55 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-23 17:04:55 +0100 |
| commit | 7d5e66022707a4aecb894a3f2356d3c8d2745d46 (patch) | |
| tree | f424c67271a2a3ddd887f16b1bb4bce28290dcd4 /sound/drivers/aloop.c | |
| parent | 7a0dbad2ed0eb0e118ff5cceac61d2566c01f64a (diff) | |
| parent | b4b33f9d64c3edcdcbea874acdc1e9626fd961f1 (diff) | |
Merge remote-tracking branch 'sound-upstream/for-next' into drm-intel-nightly
Diffstat (limited to 'sound/drivers/aloop.c')
| -rw-r--r-- | sound/drivers/aloop.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c index 7ea53399404d..7f9126efc1e5 100644 --- a/sound/drivers/aloop.c +++ b/sound/drivers/aloop.c @@ -181,8 +181,7 @@ static void loopback_timer_start(struct loopback_pcm *dpcm) } tick = dpcm->period_size_frac - dpcm->irq_pos; tick = (tick + dpcm->pcm_bps - 1) / dpcm->pcm_bps; - dpcm->timer.expires = jiffies + tick; - add_timer(&dpcm->timer); + mod_timer(&dpcm->timer, jiffies + tick); } /* call in cable->lock */ |