From 7e90c6bfd29c862d51f1bbd6dcbc8f33b9fb504b Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Sat, 19 Mar 2011 17:18:18 -0300
Subject: [PATCH] --- yaml --- r: 242095 b: refs/heads/master c:
 109a29900a36b2b1e7b7f83a561c6af7e343461f h: refs/heads/master i:   242093:
 3a343cb2da77cb0fad1ce00978c556155766c2aa   242091:
 c9fe8a379ac55814c417db1f0f4b0663313311d4   242087:
 c42ccf62b7b3b92c2d792a60bbf4902334c521ee   242079:
 f2a99d22cecede18835704f7a48ad93f30729879 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/media/dvb/frontends/af9013.c | 28 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 5f509d6dcab4..0678e19c2612 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 582e565caeaccf145e2256b84d4fde827fede72e
+refs/heads/master: 109a29900a36b2b1e7b7f83a561c6af7e343461f
diff --git a/trunk/drivers/media/dvb/frontends/af9013.c b/trunk/drivers/media/dvb/frontends/af9013.c
index ba25fa0b0fc2..6f50f0673994 100644
--- a/trunk/drivers/media/dvb/frontends/af9013.c
+++ b/trunk/drivers/media/dvb/frontends/af9013.c
@@ -1466,20 +1466,6 @@ struct dvb_frontend *af9013_attach(const struct af9013_config *config,
 	state->i2c = i2c;
 	memcpy(&state->config, config, sizeof(struct af9013_config));
 
-	/* chip version */
-	ret = af9013_read_reg_bits(state, 0xd733, 4, 4, &buf[2]);
-	if (ret)
-		goto error;
-
-	/* ROM version */
-	for (i = 0; i < 2; i++) {
-		ret = af9013_read_reg(state, 0x116b + i, &buf[i]);
-		if (ret)
-			goto error;
-	}
-	deb_info("%s: chip version:%d ROM version:%d.%d\n", __func__,
-		buf[2], buf[0], buf[1]);
-
 	/* download firmware */
 	if (state->config.output_mode != AF9013_OUTPUT_MODE_USB) {
 		ret = af9013_download_firmware(state);
@@ -1495,6 +1481,20 @@ struct dvb_frontend *af9013_attach(const struct af9013_config *config,
 	}
 	info("firmware version:%d.%d.%d.%d", buf[0], buf[1], buf[2], buf[3]);
 
+	/* chip version */
+	ret = af9013_read_reg_bits(state, 0xd733, 4, 4, &buf[2]);
+	if (ret)
+		goto error;
+
+	/* ROM version */
+	for (i = 0; i < 2; i++) {
+		ret = af9013_read_reg(state, 0x116b + i, &buf[i]);
+		if (ret)
+			goto error;
+	}
+	deb_info("%s: chip version:%d ROM version:%d.%d\n", __func__,
+		buf[2], buf[0], buf[1]);
+
 	/* settings for mp2if */
 	if (state->config.output_mode == AF9013_OUTPUT_MODE_USB) {
 		/* AF9015 split PSB to 1.5k + 0.5k */