Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a9a5fbd authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Mauro Carvalho Chehab
Browse files

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: default avatarRicardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent cb46e3c2

drivers/media/video/saa7134/saa7134-alsa.c

+3 −1
Original line number Diff line number Diff line
@@ -54,10 +54,12 @@ MODULE_PARM_DESC(debug,"enable debug messages [alsa]"); 


static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */

static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */

static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};

static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};



module_param_array(index, int, NULL, 0444);

module_param_array(enable, int, NULL, 0444);

MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s).");

MODULE_PARM_DESC(enable, "Enable (or not) the SAA7134 capture interface(s).");



#define dprintk(fmt, arg...)    if (debug) \

	printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ##arg)