diff options
| author | Ricardo Cerqueira <v4l@cerqueira.org> | 2006-02-12 04:51:29 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <v4l@cerqueira.org> | 2006-02-12 04:51:29 +0100 |
| commit | 272f66a045dd7363c586745f3cd1b9580546716a (patch) | |
| tree | 79605beb3b75ea25456bd54cb743880cb84fbaae | |
| parent | 7d69c5a6fde46835d5080e493e283758527e626a (diff) | |
| download | mediapointer-dvb-s2-272f66a045dd7363c586745f3cd1b9580546716a.tar.gz mediapointer-dvb-s2-272f66a045dd7363c586745f3cd1b9580546716a.tar.bz2 | |
Fixed saa7134 ALSA initialization with multiple cards
From: Ricardo Cerqueira <v4l@cerqueira.org>
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>
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-alsa.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-alsa.c b/linux/drivers/media/video/saa7134/saa7134-alsa.c index 1339b18ad..5f1f32ecb 100644 --- a/linux/drivers/media/video/saa7134/saa7134-alsa.c +++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c @@ -57,15 +57,18 @@ 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}; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) static int dummy; module_param_array(index, int, dummy, 0444); +module_param_array(enable, int, dummy, 0444); #else module_param_array(index, int, NULL, 0444); +module_param_array(enable, int, NULL, 0444); #endif 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) |