aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/cs5535audio/cs5535audio.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index f61c4fa4ed62..8f46190f24ad 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -56,16 +56,17 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
56 {} 56 {}
57}; 57};
58 58
59static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; 59static int index = SNDRV_DEFAULT_IDX1;
60static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; 60static char *id = SNDRV_DEFAULT_STR1;
61static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; 61/* for backward compatibility */
62static int enable;
62 63
63module_param_array(index, int, NULL, 0444); 64module_param(index, int, 0444);
64MODULE_PARM_DESC(index, "Index value for " DRIVER_NAME); 65MODULE_PARM_DESC(index, "Index value for " DRIVER_NAME);
65module_param_array(id, charp, NULL, 0444); 66module_param(id, charp, 0444);
66MODULE_PARM_DESC(id, "ID string for " DRIVER_NAME); 67MODULE_PARM_DESC(id, "ID string for " DRIVER_NAME);
67module_param_array(enable, bool, NULL, 0444); 68module_param(enable, bool, 0444);
68MODULE_PARM_DESC(enable, "Enable " DRIVER_NAME); 69MODULE_PARM_DESC(enable, "Enable for " DRIVER_NAME);
69 70
70static struct pci_device_id snd_cs5535audio_ids[] __devinitdata = { 71static struct pci_device_id snd_cs5535audio_ids[] __devinitdata = {
71 { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO) }, 72 { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO) },
@@ -357,12 +358,8 @@ static int __devinit snd_cs5535audio_probe(struct pci_dev *pci,
357 358
358 if (dev >= SNDRV_CARDS) 359 if (dev >= SNDRV_CARDS)
359 return -ENODEV; 360 return -ENODEV;
360 if (!enable[dev]) {
361 dev++;
362 return -ENOENT;
363 }
364 361
365 card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); 362 card = snd_card_new(index, id, THIS_MODULE, 0);
366 if (card == NULL) 363 if (card == NULL)
367 return -ENOMEM; 364 return -ENOMEM;
368 365