Merge branch 'linus' into timers/nohz

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

diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index f97c1ba43a2820c5ae956442f554a9cc7aa9b4be..7a1545d2d9533f4ad53b6e1693969e34cb067965 100644 (file)
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -148,14 +148,14 @@ struct snd_seq_client *snd_seq_client_use_ptr(int clientid)
                return NULL;
        }
        spin_unlock_irqrestore(&clients_lock, flags);
-#ifdef CONFIG_KMOD
-       if (!in_interrupt() && current->fs->root) {
+#ifdef CONFIG_MODULES
+       if (!in_interrupt()) {
                static char client_requested[SNDRV_SEQ_GLOBAL_CLIENTS];
                static char card_requested[SNDRV_CARDS];
                if (clientid < SNDRV_SEQ_GLOBAL_CLIENTS) {
                        int idx;
                        
-                       if (! client_requested[clientid] && current->fs->root) {
+                       if (!client_requested[clientid]) {
                                client_requested[clientid] = 1;
                                for (idx = 0; idx < 15; idx++) {
                                        if (seq_client_load[idx] < 0)