Merge branch 'topic/asoc' into for-linus

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

diff --git a/sound/core/init.c b/sound/core/init.c
index fd56afe..d5d40d7 100644 (file)
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -152,15 +152,8 @@ int snd_card_create(int idx, const char *xid,
        card = kzalloc(sizeof(*card) + extra_size, GFP_KERNEL);
        if (!card)
                return -ENOMEM;
-       if (xid) {
-               if (!snd_info_check_reserved_words(xid)) {
-                       snd_printk(KERN_ERR
-                                  "given id string '%s' is reserved.\n", xid);
-                       err = -EBUSY;
-                       goto __error;
-               }
+       if (xid)
                strlcpy(card->id, xid, sizeof(card->id));
-       }
        err = 0;
        mutex_lock(&snd_card_mutex);
        if (idx < 0) {
@@ -483,22 +476,28 @@ int snd_card_free(struct snd_card *card)
 
 EXPORT_SYMBOL(snd_card_free);
 
-static void choose_default_id(struct snd_card *card)
+static void snd_card_set_id_no_lock(struct snd_card *card, const char *nid)
 {
        int i, len, idx_flag = 0, loops = SNDRV_CARDS;
-       char *id, *spos;
+       const char *spos, *src;
+       char *id;
        
-       id = spos = card->shortname;    
-       while (*id != '\0') {
-               if (*id == ' ')
-                       spos = id + 1;
-               id++;
+       if (nid == NULL) {
+               id = card->shortname;
+               spos = src = id;
+               while (*id != '\0') {
+                       if (*id == ' ')
+                               spos = id + 1;
+                       id++;
+               }
+       } else {
+               spos = src = nid;
        }
        id = card->id;
        while (*spos != '\0' && !isalnum(*spos))
                spos++;
        if (isdigit(*spos))
-               *id++ = isalpha(card->shortname[0]) ? card->shortname[0] : 'D';
+               *id++ = isalpha(src[0]) ? src[0] : 'D';
        while (*spos != '\0' && (size_t)(id - card->id) < sizeof(card->id) - 1) {
                if (isalnum(*spos))
                        *id++ = *spos;
@@ -513,7 +512,7 @@ static void choose_default_id(struct snd_card *card)
 
        while (1) {
                if (loops-- == 0) {
-                       snd_printk(KERN_ERR "unable to choose default card id (%s)\n", id);
+                       snd_printk(KERN_ERR "unable to set card id (%s)\n", id);
                        strcpy(card->id, card->proc_root->name);
                        return;
                }
@@ -539,14 +538,33 @@ static void choose_default_id(struct snd_card *card)
                        spos = id + len - 2;
                        if ((size_t)len <= sizeof(card->id) - 2)
                                spos++;
-                       *spos++ = '_';
-                       *spos++ = '1';
-                       *spos++ = '\0';
+                       *(char *)spos++ = '_';
+                       *(char *)spos++ = '1';
+                       *(char *)spos++ = '\0';
                        idx_flag++;
                }
        }
 }
 
+/**
+ *  snd_card_set_id - set card identification name
+ *  @card: soundcard structure
+ *  @nid: new identification string
+ *
+ *  This function sets the card identification and checks for name
+ *  collisions.
+ */
+void snd_card_set_id(struct snd_card *card, const char *nid)
+{
+       /* check if user specified own card->id */
+       if (card->id[0] != '\0')
+               return;
+       mutex_lock(&snd_card_mutex);
+       snd_card_set_id_no_lock(card, nid);
+       mutex_unlock(&snd_card_mutex);
+}
+EXPORT_SYMBOL(snd_card_set_id);
+
 #ifndef CONFIG_SYSFS_DEPRECATED
 static ssize_t
 card_id_show_attr(struct device *dev,
@@ -640,8 +658,7 @@ int snd_card_register(struct snd_card *card)
                mutex_unlock(&snd_card_mutex);
                return 0;
        }
-       if (card->id[0] == '\0')
-               choose_default_id(card);
+       snd_card_set_id_no_lock(card, card->id[0] == '\0' ? NULL : card->id);
        snd_cards[card->number] = card;
        mutex_unlock(&snd_card_mutex);
        init_info_for_card(card);