---

yaml --- r: 201938 b: refs/heads/master c: 0e57ff8 h: refs/heads/master v: v3
git-mirror · Aug 2, 2010 · c235a13 · c235a13
1 parent b49479a
commit c235a13
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66e89522aff70fb2701ba8f6845fdcd365dd2ade
+refs/heads/master: 0e57ff8d5c3d98abbd2137872a8e663e553a7245
diff --git a/trunk/drivers/staging/tm6000/tm6000-alsa.c b/trunk/drivers/staging/tm6000/tm6000-alsa.c
@@ -40,7 +40,7 @@
  ****************************************************************************/
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */
-static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
+
 static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};
 
 module_param_array(enable, bool, NULL, 0444);
@@ -317,7 +317,7 @@ int tm6000_audio_init(struct tm6000_core *dev)
 	if (!enable[devnr])
 		return -ENOENT;
 
-	rc = snd_card_create(index[devnr], id[devnr], THIS_MODULE, 0, &card);
+	rc = snd_card_create(index[devnr], "tm6000", THIS_MODULE, 0, &card);
 	if (rc < 0) {
 		snd_printk(KERN_ERR "cannot create card instance %d\n", devnr);
 		return rc;