diff options
| author | Michael Hunold <devnull@localhost> | 2003-02-27 14:37:07 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-02-27 14:37:07 +0000 |
| commit | eedc7fd38fcda5ad3f241225580db5189faae05a (patch) | |
| tree | 33a6d3de2d7123dfcdea9388bbb2ac1919079bbf /linux/drivers/media/video | |
| parent | b8852a2112a64e58ed0a6a0b513e55eeceeb75ca (diff) | |
| download | mediapointer-dvb-s2-eedc7fd38fcda5ad3f241225580db5189faae05a.tar.gz mediapointer-dvb-s2-eedc7fd38fcda5ad3f241225580db5189faae05a.tar.bz2 | |
- fix some bugs that appeared in system with both analog and digital
based saa7146 cards
- change the initialization order to allow static builds of the mxb driver
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/mxb.c | 7 | ||||
| -rw-r--r-- | linux/drivers/media/video/tea6420.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/linux/drivers/media/video/mxb.c b/linux/drivers/media/video/mxb.c index b7e459371..ae3b5a7c3 100644 --- a/linux/drivers/media/video/mxb.c +++ b/linux/drivers/media/video/mxb.c @@ -206,6 +206,12 @@ static int mxb_probe(struct saa7146_dev* dev) struct mxb* mxb = 0; int i = 0; + request_module("tuner"); + request_module("tea6420"); + request_module("tea6415c"); + request_module("tda9840"); + request_module("saa7111"); + mxb = (struct mxb*)kmalloc(sizeof(struct mxb), GFP_KERNEL); if( NULL == mxb ) { DEB_D(("not enough kernel memory.\n")); @@ -243,6 +249,7 @@ static int mxb_probe(struct saa7146_dev* dev) /* check if all devices are present */ if( 0 == mxb->tea6420_1 || 0 == mxb->tea6420_2 || 0 == mxb->tea6415c || 0 == mxb->tda9840 || 0 == mxb->saa7111a || 0 == mxb->tuner ) { + printk("mxb: did not find all i2c devices. are you sure you\n"); printk("mxb: insmod'ed tea6420, tea6415c, saa7111, tea6415c and tuner?\n"); i2c_del_adapter(&mxb->i2c_adapter); diff --git a/linux/drivers/media/video/tea6420.c b/linux/drivers/media/video/tea6420.c index d860d1002..3d8bf1e18 100644 --- a/linux/drivers/media/video/tea6420.c +++ b/linux/drivers/media/video/tea6420.c @@ -1,5 +1,5 @@ /* - tea6420.h - i2c-driver for the tea6420 by SGS Thomson + tea6420.o - i2c-driver for the tea6420 by SGS Thomson Copyright (C) 1998-2003 Michael Hunold <michael@mihu.de> |