Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv15017/core

Modified Files:
        sound.c timer.c 
Log Message:
- check rootfs before calling request_module() to avoid annoying
  error messages at the boot time.



Index: sound.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/sound.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sound.c     25 Sep 2003 18:55:42 -0000      1.49
+++ sound.c     7 Oct 2003 12:12:19 -0000       1.50
@@ -77,6 +77,8 @@
 {
        int locked;
 
+       if (! current->fs->root)
+               return;
        read_lock(&snd_card_rwlock);
        locked = snd_cards_lock & (1 << card);
        read_unlock(&snd_card_rwlock);
@@ -91,6 +93,8 @@
 {
        char *str;
 
+       if (! current->fs->root)
+               return;
        switch (minor) {
        case SNDRV_MINOR_SEQUENCER:     str = "snd-seq";        break;
        case SNDRV_MINOR_TIMER:         str = "snd-timer";      break;

Index: timer.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/timer.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- timer.c     7 Oct 2003 10:07:13 -0000       1.48
+++ timer.c     7 Oct 2003 12:12:20 -0000       1.49
@@ -148,6 +148,8 @@
 
 static void snd_timer_request(snd_timer_id_t *tid)
 {
+       if (! current->fs->root)
+               return;
        switch (tid->dev_class) {
        case SNDRV_TIMER_CLASS_GLOBAL:
                if (tid->device < timer_limit)



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to