[alsa-cvslog] alsa-kernel: Official ALSA project GIT repository for Linux 2.6 branch, master now at v2.6.30-rc7-469-gc5313f6

[<nor...@al...>]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  c5313f60c4a50d6f0bb7d535310b654c4e9a449c (commit)
  based on  197516255ad668b22e642232903e7659a5942ef7
      from  a37ebc81fb54513ee39debe05b3c356e84d6bb55 (commit)

This ref update crossed a branch point; i.e. the old rev is not a strict
subset of the new rev.  This occurs, when you --force push a change in
a situation like this:

 * -- * -- B -- O -- O -- O (a37ebc81fb54513ee39debe05b3c356e84d6bb55)
            \
             N -- N -- N (c5313f60c4a50d6f0bb7d535310b654c4e9a449c)

Therefore, we assume that you've already had alert emails for all
of the O revisions, and now give you all the revisions in the N branch
from the common base, B (197516255ad668b22e642232903e7659a5942ef7), up to the new revision.

- Log -----------------------------------------------------------------
commit c5313f60c4a50d6f0bb7d535310b654c4e9a449c
Author:     Jaroslav Kysela <pe...@pe...>
AuthorDate: Thu Jun 4 00:12:18 2009 +0200
Commit:     Jaroslav Kysela <pe...@pe...>
CommitDate: Thu Jun 4 00:27:32 2009 +0200

    ALSA: Core - clean up snd_card_set_id* calls and remove possible id collision
    
    Move locking outside snd_card_set_id_internal() function and rename it
    to snd_card_set_id_no_lock() for better function description.
    
    User defined id is just copied to card structure at allocation time.
    The real unique id procedure is called in snd_card_register() to
    ensure real atomicity.
    
    Signed-off-by: Jaroslav Kysela <pe...@pe...>

-----------------------------------------------------------------------

Diffstat:
 sound/core/init.c |   26 ++++++++++----------------
 1 files changed, 10 insertions(+), 16 deletions(-)


Patch -------------- (max 1500 lines)
diff --git a/sound/core/init.c b/sound/core/init.c
index a578d05..d5d40d7 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -153,7 +153,7 @@ int snd_card_create(int idx, const char *xid,
 	if (!card)
 		return -ENOMEM;
 	if (xid)
-		snd_card_set_id(card, xid);
+		strlcpy(card->id, xid, sizeof(card->id));
 	err = 0;
 	mutex_lock(&snd_card_mutex);
 	if (idx < 0) {
@@ -476,16 +476,12 @@ int snd_card_free(struct snd_card *card)
 
 EXPORT_SYMBOL(snd_card_free);
 
-static void snd_card_set_id_internal(struct snd_card *card, const char *nid,
-				     int do_locking)
+static void snd_card_set_id_no_lock(struct snd_card *card, const char *nid)
 {
 	int i, len, idx_flag = 0, loops = SNDRV_CARDS;
 	const char *spos, *src;
 	char *id;
 	
-	/* check if user specified own card->id */
-	if (card->id[0] != '\0')
-		return;
 	if (nid == NULL) {
 		id = card->shortname;
 		spos = src = id;
@@ -522,16 +518,10 @@ static void snd_card_set_id_internal(struct snd_card *card, const char *nid,
       		}
 	      	if (!snd_info_check_reserved_words(id))
       			goto __change;
-		if (do_locking)
-			mutex_lock(&snd_card_mutex);
 		for (i = 0; i < snd_ecards_limit; i++) {
-			if (snd_cards[i] && !strcmp(snd_cards[i]->id, id)) {
-				mutex_unlock(&snd_card_mutex);
+			if (snd_cards[i] && !strcmp(snd_cards[i]->id, id))
 				goto __change;
-			}
 		}
-		if (do_locking)
-			mutex_unlock(&snd_card_mutex);
 		break;
 
 	      __change:
@@ -566,7 +556,12 @@ static void snd_card_set_id_internal(struct snd_card *card, const char *nid,
  */
 void snd_card_set_id(struct snd_card *card, const char *nid)
 {
-	snd_card_set_id_internal(card, nid, 1);
+	/* 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);
 
@@ -663,8 +658,7 @@ int snd_card_register(struct snd_card *card)
 		mutex_unlock(&snd_card_mutex);
 		return 0;
 	}
-	if (card->id[0] == '\0')
-		snd_card_set_id_internal(card, NULL, 0);
+	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);
------- End of patch

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  a37ebc81fb54513ee39debe05b3c356e84d6bb55 \
  c5313f60c4a50d6f0bb7d535310b654c4e9a449c