Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
V4L/DVB (3348): Fixed saa7134 ALSA initialization with multiple cards
When multiple cards were installed, only the first card would have
audio initialized, because only the first position in the array parameter
defaulted to "1"
To make things worse, the "enable" parameter wasn't enabled, so there
was no workaround.
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
authored by Ricardo Cerqueira and committed by Mauro Carvalho Chehab ede22415 ca659a41
+3
-1
drivers/media/video/saa7134/saa7134-alsa.c
+3
-1
drivers/media/video/saa7134/saa7134-alsa.c
···
54
55
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
56
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
57
-
static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
58
59
module_param_array(index, int, NULL, 0444);
60
MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s).");
61
62
#define dprintk(fmt, arg...) if (debug) \
63
printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ##arg)
···
54
55
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
56
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
57
+
static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};
58
59
module_param_array(index, int, NULL, 0444);
60
+
module_param_array(enable, int, NULL, 0444);
61
MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s).");
62
+
MODULE_PARM_DESC(enable, "Enable (or not) the SAA7134 capture interface(s).");
63
64
#define dprintk(fmt, arg...) if (debug) \
65
printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ##arg)