summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Hunold <hunold@linuxtv.org>2006-11-28 08:13:58 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-10 09:05:26 -0200
commita08cc44ec12e0a994ee85ba365315dbee982d6a7 (patch)
tree132abc2011afa38c96dbab2fc859d9f47ef77a93
parent036171e75ef866b4fd8650c5b890359482ba2a4c (diff)
downloadtalos-obmc-linux-a08cc44ec12e0a994ee85ba365315dbee982d6a7.tar.gz
talos-obmc-linux-a08cc44ec12e0a994ee85ba365315dbee982d6a7.zip
V4L/DVB (4894): Mxb: fix to load the proper i2c modules
Change order of module requests, so that tuner module is loaded at the end, because the tuner module probes multiple i2c addresses and might grab an i2c address that is not a tuner but something else. Signed-off-by: Michael Hunold <hunold@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/mxb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index b0aea4002d11..152cc6b3e152 100644
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -160,10 +160,6 @@ static int mxb_probe(struct saa7146_dev* dev)
printk("mxb: saa7111 i2c module not available.\n");
return -ENODEV;
}
- if ((result = request_module("tuner")) < 0) {
- printk("mxb: tuner i2c module not available.\n");
- return -ENODEV;
- }
if ((result = request_module("tea6420")) < 0) {
printk("mxb: tea6420 i2c module not available.\n");
return -ENODEV;
@@ -176,6 +172,10 @@ static int mxb_probe(struct saa7146_dev* dev)
printk("mxb: tda9840 i2c module not available.\n");
return -ENODEV;
}
+ if ((result = request_module("tuner")) < 0) {
+ printk("mxb: tuner i2c module not available.\n");
+ return -ENODEV;
+ }
mxb = kzalloc(sizeof(struct mxb), GFP_KERNEL);
if( NULL == mxb ) {
OpenPOWER on IntegriCloud