diff options
| author | Mark Brown <broonie@kernel.org> | 2018-01-25 18:16:26 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-25 18:16:26 +0000 |
| commit | 0b5eca67bd2d0e6f6d0ccdc316aced0cc4bf2e9f (patch) | |
| tree | b6597ffe774a67ab5b8eebd57c9a723732d3a39c /sound/core/hrtimer.c | |
| parent | 3bb0f7c31b1aedd0f85c675297031281799145d7 (diff) | |
| parent | 93a00c467fe998bf5716cbc9cabc127046054782 (diff) | |
| download | linux-0b5eca67bd2d0e6f6d0ccdc316aced0cc4bf2e9f.tar.gz linux-0b5eca67bd2d0e6f6d0ccdc316aced0cc4bf2e9f.tar.bz2 linux-0b5eca67bd2d0e6f6d0ccdc316aced0cc4bf2e9f.zip | |
Merge branches 'topic/twl4030' and 'topic/twl6040' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-twl-breakage
Diffstat (limited to 'sound/core/hrtimer.c')
| -rw-r--r-- | sound/core/hrtimer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/hrtimer.c b/sound/core/hrtimer.c index 1ac0c423903e..18cb6f476bf4 100644 --- a/sound/core/hrtimer.c +++ b/sound/core/hrtimer.c @@ -127,7 +127,7 @@ static int snd_hrtimer_stop(struct snd_timer *t) return 0; } -static struct snd_timer_hardware hrtimer_hw = { +static const struct snd_timer_hardware hrtimer_hw __initconst = { .flags = SNDRV_TIMER_HW_AUTO | SNDRV_TIMER_HW_TASKLET, .open = snd_hrtimer_open, .close = snd_hrtimer_close, @@ -159,6 +159,7 @@ static int __init snd_hrtimer_init(void) timer->hw = hrtimer_hw; timer->hw.resolution = resolution; timer->hw.ticks = NANO_SEC / resolution; + timer->max_instances = 100; /* lower the limit */ err = snd_timer_global_register(timer); if (err < 0) { |