This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/v4l-dvb.git tree:

Subject: tm6000: Avoid OOPS when loading tm6000-alsa module
Author:  Mauro Carvalho Chehab <[email protected]>
Date:    Thu Jun 3 13:45:41 2010 -0300

Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 drivers/staging/tm6000/tm6000-alsa.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

---

http://git.linuxtv.org/v4l-dvb.git?a=commitdiff;h=0cc10a035c814e23ff1c1bca6fe52e81f4b34afc

diff --git a/drivers/staging/tm6000/tm6000-alsa.c 
b/drivers/staging/tm6000/tm6000-alsa.c
index 55a0925..8520434 100644
--- a/drivers/staging/tm6000/tm6000-alsa.c
+++ b/drivers/staging/tm6000/tm6000-alsa.c
@@ -39,7 +39,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);
@@ -316,7 +316,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;

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to