evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] af9013: download FW earlier in attach()

Browse source 
Quick test shows that FW must be running before other checks
so make it happen earlier.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Antti Palosaari 2011-03-19 17:18:18 -03:00 • committed by Mauro Carvalho Chehab
parent 582e565cae
commit 109a29900a
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/media/dvb/frontends/af9013.c
View file

@ -1466,20 +1466,6 @@ struct dvb_frontend *af9013_attach(const struct af9013_config *config,
state->i2c = i2c; state->i2c = i2c;
memcpy(&state->config, config, sizeof(struct af9013_config)); 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 */ /* download firmware */
if (state->config.output_mode != AF9013_OUTPUT_MODE_USB) { if (state->config.output_mode != AF9013_OUTPUT_MODE_USB) {
ret = af9013_download_firmware(state); 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]); 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 */ /* settings for mp2if */
if (state->config.output_mode == AF9013_OUTPUT_MODE_USB) { if (state->config.output_mode == AF9013_OUTPUT_MODE_USB) {
/* AF9015 split PSB to 1.5k + 0.5k */ /* AF9015 split PSB to 1.5k + 0.5k */