From: Jurgen Kramer <gtmkramer@xs4all.nl>
Date: Mon, 8 Dec 2014 08:30:44 +0000 (-0300)
Subject: [media] Si2168: increase timeout to fix firmware loading
X-Git-Tag: v3.16.35~2661
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c482bf31e1c6753b3575ab96240006ab213a777;p=thirdparty%2Fkernel%2Fstable.git

[media] Si2168: increase timeout to fix firmware loading

commit 551c33e729f654ecfaed00ad399f5d2a631b72cb upstream.

Increase si2168 cmd execute timeout to prevent firmware load failures. Tests
shows it takes up to 52ms to load the 'dvb-demod-si2168-a30-01.fw' firmware.
Increase timeout to a safe value of 70ms.

Signed-off-by: Jurgen Kramer <gtmkramer@xs4all.nl>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
index 23cc7f0899749..f6846954b9a64 100644
--- a/drivers/media/dvb-frontends/si2168.c
+++ b/drivers/media/dvb-frontends/si2168.c
@@ -39,7 +39,7 @@ static int si2168_cmd_execute(struct si2168 *s, struct si2168_cmd *cmd)
 
 	if (cmd->rlen) {
 		/* wait cmd execution terminate */
-		#define TIMEOUT 50
+		#define TIMEOUT 70
 		timeout = jiffies + msecs_to_jiffies(TIMEOUT);
 		while (!time_after(jiffies, timeout)) {
 			ret = i2c_master_recv(s->client, cmd->args, cmd->rlen);