media: dvb_ca_en50221: Increase timeout for link init
authorRalph Metzler <rjkm@metzlerbros.de>
Sun, 25 Jun 2017 21:37:06 +0000 (18:37 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Mon, 26 Jun 2017 11:15:04 +0000 (08:15 -0300)
Some CAMs do a really slow initialization, which requires a longer timeout
for the first response.

Original code change by Ralph Metzler, modified by Jasmin Jessich to match
Kernel code style.

Signed-off-by: Ralph Metzler <rjkm@metzlerbros.de>
Signed-off-by: Jasmin Jessich <jasmin@anw.at>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/dvb-core/dvb_ca_en50221.c

index 80edbe87be189d0bec28b637c39f2cabe639342e..529e7ec3279baaa306b1b330e8218e23ce10e175 100644 (file)
@@ -349,7 +349,8 @@ static int dvb_ca_en50221_link_init(struct dvb_ca_private *ca, int slot)
        /* read the buffer size from the CAM */
        if ((ret = ca->pub->write_cam_control(ca->pub, slot, CTRLIF_COMMAND, IRQEN | CMDREG_SR)) != 0)
                return ret;
-       if ((ret = dvb_ca_en50221_wait_if_status(ca, slot, STATUSREG_DA, HZ / 10)) != 0)
+       ret = dvb_ca_en50221_wait_if_status(ca, slot, STATUSREG_DA, HZ);
+       if (ret != 0)
                return ret;
        if ((ret = dvb_ca_en50221_read_data(ca, slot, buf, 2)) != 2)
                return -EIO;