aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/caiaq/device.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c
index 48b63ccc78c7..23cf55dbc54e 100644
--- a/sound/usb/caiaq/device.c
+++ b/sound/usb/caiaq/device.c
@@ -57,7 +57,6 @@ MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
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)