Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / sound / core / hrtimer.c

diff --git a/sound/core/hrtimer.c b/sound/core/hrtimer.c
index 14d483d..834fa60 100644 (file)
--- a/sound/core/hrtimer.c
+++ b/sound/core/hrtimer.c
@@ -145,6 +145,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) {