From: Michael Hunold <hunold@linuxtv.org>
Date: Tue, 28 Nov 2006 11:13:58 +0000 (-0300)
Subject: V4L/DVB (4894): Mxb: fix to load the proper i2c modules
X-Git-Tag: v2.6.20-rc1~145^2~5^2~46
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a08cc44ec12e0a994ee85ba365315dbee982d6a7;p=linux-2.6

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>
---

diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index b0aea4002d..152cc6b3e1 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 ) {