diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-06-03 12:45:41 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 13:05:50 -0400 |
commit | 0e57ff8d5c3d98abbd2137872a8e663e553a7245 (patch) | |
tree | e39b4f94ea05f6e8ff3831101a314d04475ad6e1 /drivers | |
parent | 66e89522aff70fb2701ba8f6845fdcd365dd2ade (diff) |
V4L/DVB: tm6000: Avoid OOPS when loading tm6000-alsa module
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/tm6000/tm6000-alsa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c index da221e22e27f..04e6f7a3b9f1 100644 --- a/drivers/staging/tm6000/tm6000-alsa.c +++ b/drivers/staging/tm6000/tm6000-alsa.c | |||
@@ -40,7 +40,7 @@ | |||
40 | ****************************************************************************/ | 40 | ****************************************************************************/ |
41 | 41 | ||
42 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ | 42 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ |
43 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ | 43 | |
44 | static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1}; | 44 | static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1}; |
45 | 45 | ||
46 | module_param_array(enable, bool, NULL, 0444); | 46 | module_param_array(enable, bool, NULL, 0444); |
@@ -317,7 +317,7 @@ int tm6000_audio_init(struct tm6000_core *dev) | |||
317 | if (!enable[devnr]) | 317 | if (!enable[devnr]) |
318 | return -ENOENT; | 318 | return -ENOENT; |
319 | 319 | ||
320 | rc = snd_card_create(index[devnr], id[devnr], THIS_MODULE, 0, &card); | 320 | rc = snd_card_create(index[devnr], "tm6000", THIS_MODULE, 0, &card); |
321 | if (rc < 0) { | 321 | if (rc < 0) { |
322 | snd_printk(KERN_ERR "cannot create card instance %d\n", devnr); | 322 | snd_printk(KERN_ERR "cannot create card instance %d\n", devnr); |
323 | return rc; | 323 | return rc; |