aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/caiaq/device.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb/caiaq/device.c')
-rw-r--r--sound/usb/caiaq/device.c31
1 files changed, 15 insertions, 16 deletions
diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c
index 48b63ccc78c7..1a61dd12fe38 100644
--- a/sound/usb/caiaq/device.c
+++ b/sound/usb/caiaq/device.c
@@ -39,25 +39,24 @@
39MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); 39MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
40MODULE_DESCRIPTION("caiaq USB audio"); 40MODULE_DESCRIPTION("caiaq USB audio");
41MODULE_LICENSE("GPL"); 41MODULE_LICENSE("GPL");
42MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," 42MODULE_SUPPORTED_DEVICE("{{Native Instruments,RigKontrol2},"
43 "{Native Instruments, RigKontrol3}," 43 "{Native Instruments,RigKontrol3},"
44 "{Native Instruments, Kore Controller}," 44 "{Native Instruments,Kore Controller},"
45 "{Native Instruments, Kore Controller 2}," 45 "{Native Instruments,Kore Controller 2},"
46 "{Native Instruments, Audio Kontrol 1}," 46 "{Native Instruments,Audio Kontrol 1},"
47 "{Native Instruments, Audio 2 DJ}," 47 "{Native Instruments,Audio 2 DJ},"
48 "{Native Instruments, Audio 4 DJ}," 48 "{Native Instruments,Audio 4 DJ},"
49 "{Native Instruments, Audio 8 DJ}," 49 "{Native Instruments,Audio 8 DJ},"
50 "{Native Instruments, Traktor Audio 2}," 50 "{Native Instruments,Traktor Audio 2},"
51 "{Native Instruments, Session I/O}," 51 "{Native Instruments,Session I/O},"
52 "{Native Instruments, GuitarRig mobile}," 52 "{Native Instruments,GuitarRig mobile},"
53 "{Native Instruments, Traktor Kontrol X1}," 53 "{Native Instruments,Traktor Kontrol X1},"
54 "{Native Instruments, Traktor Kontrol S4}," 54 "{Native Instruments,Traktor Kontrol S4},"
55 "{Native Instruments, Maschine Controller}}"); 55 "{Native Instruments,Maschine Controller}}");
56 56
57static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */ 57static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */
58static char* id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for this card */ 58static char* id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for this card */
59static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */ 59static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
60static int snd_card_used[SNDRV_CARDS];
61 60
62module_param_array(index, int, NULL, 0444); 61module_param_array(index, int, NULL, 0444);
63MODULE_PARM_DESC(index, "Index value for the caiaq sound device"); 62MODULE_PARM_DESC(index, "Index value for the caiaq sound device");
@@ -388,7 +387,7 @@ static int create_card(struct usb_device *usb_dev,
388 struct snd_usb_caiaqdev *cdev; 387 struct snd_usb_caiaqdev *cdev;
389 388
390 for (devnum = 0; devnum < SNDRV_CARDS; devnum++) 389 for (devnum = 0; devnum < SNDRV_CARDS; devnum++)
391 if (enable[devnum] && !snd_card_used[devnum]) 390 if (enable[devnum])
392 break; 391 break;
393 392
394 if (devnum >= SNDRV_CARDS) 393 if (devnum >= SNDRV_CARDS)