diff options
author | Ralph Metzler <rjkm@metzlerbros.de> | 2017-06-25 18:37:06 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-06-26 08:15:04 -0300 |
commit | 5dbddc99ec886b8382b0cfb9b9f52c830a344601 (patch) | |
tree | 2c33663875b69dad8df9145e81ce0b5c61c88c26 /drivers/media/dvb-core/dvb_ca_en50221.c | |
parent | cb61488a2f42b14b64e8bc9496299718e92cd49a (diff) | |
download | op-kernel-dev-5dbddc99ec886b8382b0cfb9b9f52c830a344601.zip op-kernel-dev-5dbddc99ec886b8382b0cfb9b9f52c830a344601.tar.gz |
media: dvb_ca_en50221: Increase timeout for link init
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>
Diffstat (limited to 'drivers/media/dvb-core/dvb_ca_en50221.c')
-rw-r--r-- | drivers/media/dvb-core/dvb_ca_en50221.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c index 80edbe8..529e7ec 100644 --- a/drivers/media/dvb-core/dvb_ca_en50221.c +++ b/drivers/media/dvb-core/dvb_ca_en50221.c @@ -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; |