Merge branch 'for-next' into for-linus

4.18-rc1 merge material.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 1 insertions, 3 deletions

diff --git a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c
index 23167578231f..f587d0e27476 100644
--- a/sound/core/seq/seq_timer.c
+++ b/sound/core/seq/seq_timer.c
@@ -371,9 +371,7 @@ static int initialize_timer(struct snd_seq_timer *tmr)
 
         tmr->ticks = 1;
         if (!(t->hw.flags & SNDRV_TIMER_HW_SLAVE)) {
-                unsigned long r = t->hw.resolution;
-                if (! r && t->hw.c_resolution)
-                        r = t->hw.c_resolution(t);
+                unsigned long r = snd_timer_resolution(tmr->timeri);
                 if (r) {
                         tmr->ticks = (unsigned int)(1000000000uL / (r * freq));
                         if (! tmr->ticks)