Merge tag 'for-linus-20150216' of git://git.infradead.org/linux-mtd

[firefly-linux-kernel-4.4.55.git] / sound / drivers / aloop.c

diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c
index 7ea53399404dc59f3823dd3e92a2c4c41df10f03..7f9126efc1e51229373316b25e965e92ffbc08a9 100644 (file)
--- 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 */