[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_codec.c,1.76,1.77

[Jaroslav Kysela]

Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv5301

Modified Files:
        ac97_codec.c 
Log Message:
Fill card->mixername at right positions

Index: ac97_codec.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ac97_codec.c        28 Feb 2003 09:15:45 -0000      1.76
+++ ac97_codec.c        28 Feb 2003 19:22:18 -0000      1.77
@@ -2051,15 +2051,15 @@
                ac97->init(ac97);
        snd_ac97_get_name(ac97, ac97->id, name, 0);
        snd_ac97_get_name(NULL, ac97->id, name, 0);  // ac97->id might be changed in 
the special setup code
-       if (card->mixername[0] == '\0') {
-               strcpy(card->mixername, name);
-       } else {
-               if (strlen(card->mixername) + 1 + strlen(name) + 1 <= 
sizeof(card->mixername)) {
-                       strcat(card->mixername, ",");
-                       strcat(card->mixername, name);
-               }
-       }
        if (ac97_is_audio(ac97)) {
+               if (card->mixername[0] == '\0') {
+                       strcpy(card->mixername, name);
+               } else {
+                       if (strlen(card->mixername) + 1 + strlen(name) + 1 <= 
sizeof(card->mixername)) {
+                               strcat(card->mixername, ",");
+                               strcat(card->mixername, name);
+                       }
+               }
                if ((err = snd_component_add(card, "AC97a")) < 0) {
                        snd_ac97_free(ac97);
                        return err;
@@ -2240,15 +2240,15 @@
                ac97->init(ac97);
        snd_ac97_get_name(ac97, ac97->id, name, 1);
        snd_ac97_get_name(NULL, ac97->id, name, 1);  // ac97->id might be changed in 
the special setup code
-       if (card->mixername[0] == '\0') {
-               strcpy(card->mixername, name);
-       } else {
-               if (strlen(card->mixername) + 1 + strlen(name) + 1 <= 
sizeof(card->mixername)) {
-                       strcat(card->mixername, ",");
-                       strcat(card->mixername, name);
-               }
-       }
        if (ac97_is_modem(ac97)) {
+               if (card->mixername[0] == '\0') {
+                       strcpy(card->mixername, name);
+               } else {
+                       if (strlen(card->mixername) + 1 + strlen(name) + 1 <= 
sizeof(card->mixername)) {
+                               strcat(card->mixername, ",");
+                               strcat(card->mixername, name);
+                       }
+               }
                if ((err = snd_component_add(card, "AC97m")) < 0) {
                        snd_ac97_free(ac97);
                        return err;



-------------------------------------------------------
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