diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-31 09:14:24 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-31 09:14:24 -0200 |
| commit | 3f7305a1eb510b65eddf1867e6696f56a102b508 (patch) | |
| tree | ea3f28beb8226fdbf212e623ca6941ef97fd91e0 | |
| parent | c486f5a8bc4d8eac66b2017d78ce2466c32d1ff9 (diff) | |
| download | mediapointer-dvb-s2-3f7305a1eb510b65eddf1867e6696f56a102b508.tar.gz mediapointer-dvb-s2-3f7305a1eb510b65eddf1867e6696f56a102b508.tar.bz2 | |
saa7134-core: loading saa7134-alsa is now the default
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Most boards nowadays supports saa7134-alsa. Even some of they doesn't have any
option to wire an audio cable. So, lets load saa7134-alsa by default, if the
board is not based on saa7130 and if saa7134-alsa is compiled.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 527c25087..6e98c992c 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -54,9 +54,9 @@ static unsigned int gpio_tracking; module_param(gpio_tracking, int, 0644); MODULE_PARM_DESC(gpio_tracking,"enable debug messages [gpio]"); -static unsigned int alsa; +static unsigned int alsa = 1; module_param(alsa, int, 0644); -MODULE_PARM_DESC(alsa,"enable ALSA DMA sound [dmasound]"); +MODULE_PARM_DESC(alsa,"enable/disable ALSA DMA sound [dmasound]"); static unsigned int latency = UNSET; module_param(latency, int, 0444); @@ -197,8 +197,10 @@ static void request_module_async(struct work_struct *work){ request_module("saa7134-empress"); if (card_is_dvb(dev)) request_module("saa7134-dvb"); - if (alsa) - request_module("saa7134-alsa"); + if (alsa) { + if (dev->pci->device != PCI_DEVICE_ID_PHILIPS_SAA7130) + request_module("saa7134-alsa"); + } } static void request_submodules(struct saa7134_dev *dev) |