diff options
| author | Ricardo Cerqueira <devnull@localhost> | 2005-11-07 03:34:24 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <devnull@localhost> | 2005-11-07 03:34:24 +0000 |
| commit | 8613a2744e3cc9bfb6e2cabe13d87c2d79c1c438 (patch) | |
| tree | 56ded98baf3a59c404bfbd90a228bb765293c891 /linux | |
| parent | 52412b6a13eca8fcc37a1b3a0b90bd80c8847333 (diff) | |
| download | mediapointer-dvb-s2-8613a2744e3cc9bfb6e2cabe13d87c2d79c1c438.tar.gz mediapointer-dvb-s2-8613a2744e3cc9bfb6e2cabe13d87c2d79c1c438.tar.bz2 | |
- saa7134-alsa can only be autoloaded after saa7134 is active
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index fde6e07c2..0d772923d 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-core.c,v 1.49 2005/11/07 02:33:06 rmcc Exp $ + * $Id: saa7134-core.c,v 1.50 2005/11/07 03:34:24 rmcc Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -257,6 +257,7 @@ static void dump_statusregs(struct saa7134_dev *dev) #ifdef CONFIG_MODULES static int need_empress; static int need_dvb; +static int need_alsa; static int pending_registered=0; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) @@ -273,6 +274,8 @@ static int pending_call(struct notifier_block *self, unsigned long state, request_module("saa7134-empress"); if (need_dvb) request_module("saa7134-dvb"); + if (need_alsa) + request_module("saa7134-alsa"); return NOTIFY_DONE; } @@ -1057,6 +1060,12 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, if (card_is_dvb(dev)) request_module_depend("saa7134-dvb",&need_dvb); + if (!oss && alsa) { + dprintk("Requesting ALSA module\n"); + request_module_depend("saa7134-alsa",&need_alsa); + } + + v4l2_prio_init(&dev->prio); /* register v4l devices */ @@ -1111,8 +1120,6 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, goto fail5; printk(KERN_INFO "%s: registered device mixer%d\n", dev->name,dev->oss.minor_mixer >> 4); - } else if (alsa) { - request_module("saa7134-alsa"); } break; } |