diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index b8c38a0288413fce1e1502c18ad1c7b3cbab20b5..505591a7abe970dbaa694c9c714e32a660159ca9 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);