V4L/DVB (5326): Allow to set tuner_config in attach inform

This patch move the assignment of the tuner config and the callback
before the check whether it is called in the attach inform.
This solves a module load order issue

Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index b8c38a02884..505591a7abe 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -160,20 +160,20 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 return;
         }
 
+        t->type = type;
+        t->config = new_config;
+        if (tuner_callback != NULL) {
+                tuner_dbg("defining GPIO callback\n");
+                t->tuner_callback = tuner_callback;
+        }
+
         /* This code detects calls by card attach_inform */
         if (NULL == t->i2c.dev.driver) {
                 tuner_dbg ("tuner 0x%02x: called during i2c_client register by adapter's attach_inform\n", c->addr);
 
-                t->type=type;
                 return;
         }
 
-        t->type = type;
-        t->config = new_config;
-        if (tuner_callback != NULL) {
-                tuner_dbg("defining GPIO callback\n");
-                t->tuner_callback = tuner_callback;
-        }
         switch (t->type) {
         case TUNER_MT2032:
                 microtune_init(c);