Commit a08cc44e authored by Michael Hunold's avatar Michael Hunold Committed by Mauro Carvalho Chehab

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: default avatarMichael Hunold <hunold@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 036171e7
...@@ -160,10 +160,6 @@ static int mxb_probe(struct saa7146_dev* dev) ...@@ -160,10 +160,6 @@ static int mxb_probe(struct saa7146_dev* dev)
printk("mxb: saa7111 i2c module not available.\n"); printk("mxb: saa7111 i2c module not available.\n");
return -ENODEV; return -ENODEV;
} }
if ((result = request_module("tuner")) < 0) {
printk("mxb: tuner i2c module not available.\n");
return -ENODEV;
}
if ((result = request_module("tea6420")) < 0) { if ((result = request_module("tea6420")) < 0) {
printk("mxb: tea6420 i2c module not available.\n"); printk("mxb: tea6420 i2c module not available.\n");
return -ENODEV; return -ENODEV;
...@@ -176,6 +172,10 @@ static int mxb_probe(struct saa7146_dev* dev) ...@@ -176,6 +172,10 @@ static int mxb_probe(struct saa7146_dev* dev)
printk("mxb: tda9840 i2c module not available.\n"); printk("mxb: tda9840 i2c module not available.\n");
return -ENODEV; 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); mxb = kzalloc(sizeof(struct mxb), GFP_KERNEL);
if( NULL == mxb ) { if( NULL == mxb ) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment