r8169: additional 8101 and 8102 support

[linux-2.6-omap-h63xx.git] / sound / core / timer.c

diff --git a/sound/core/timer.c b/sound/core/timer.c
index aece465934b86aa5f4266870b7e3cc7c1e745b1b..0af337efc64e282367727e965bb36c090d0afd37 100644 (file)
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -146,12 +146,10 @@ static struct snd_timer *snd_timer_find(struct snd_timer_id *tid)
        return NULL;
 }
 
-#ifdef CONFIG_KMOD
+#ifdef CONFIG_MODULES
 
 static void snd_timer_request(struct snd_timer_id *tid)
 {
-       if (! current->fs->root)
-               return;
        switch (tid->dev_class) {
        case SNDRV_TIMER_CLASS_GLOBAL:
                if (tid->device < timer_limit)
@@ -261,8 +259,8 @@ int snd_timer_open(struct snd_timer_instance **ti,
        /* open a master instance */
        mutex_lock(&register_mutex);
        timer = snd_timer_find(tid);
-#ifdef CONFIG_KMOD
-       if (timer == NULL) {
+#ifdef CONFIG_MODULES
+       if (!timer) {
                mutex_unlock(&register_mutex);
                snd_timer_request(tid);
                mutex_lock(&register_mutex);