[media] af9015: move 2nd demod power-up wait different location
authorAntti Palosaari <crope@iki.fi>
Wed, 14 Jun 2017 00:32:08 +0000 (21:32 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Tue, 20 Jun 2017 13:26:13 +0000 (10:26 -0300)
We need to wait 2nd demod power-up before download firmware. Move
that wait to more correct location.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/usb/dvb-usb-v2/af9015.c

index 2b9bb81..23bbbf3 100644 (file)
@@ -741,9 +741,6 @@ static int af9015_copy_firmware(struct dvb_usb_device *d)
        fw_params[2] = state->firmware_checksum >> 8;
        fw_params[3] = state->firmware_checksum & 0xff;
 
-       /* wait 2nd demodulator ready */
-       msleep(100);
-
        ret = af9015_read_reg_i2c(d, state->af9013_config[1].i2c_addr,
                        0x98be, &val);
        if (ret)
@@ -831,6 +828,9 @@ static int af9015_af9013_frontend_attach(struct dvb_usb_adapter *adap)
 
                /* copy firmware to 2nd demodulator */
                if (state->dual_mode) {
+                       /* Wait 2nd demodulator ready */
+                       msleep(100);
+
                        ret = af9015_copy_firmware(adap_to_d(adap));
                        if (ret) {
                                dev_err(&adap_to_d(adap)->udev->dev,