From: Todor Tomov <todor.tomov@linaro.org>
Date: Wed, 13 Dec 2017 15:24:33 +0000 (+0200)
Subject: i2c-qcom-cci: Fix run queue completion timeout
X-Git-Tag: Ubuntu-4.15.0-16.17~279
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b95b6808b1afe7dccfc731e806b30d74731583f9;p=mirror_ubuntu-bionic-kernel.git

i2c-qcom-cci: Fix run queue completion timeout

BugLink: http://bugs.launchpad.net/bugs/1763040

Convert ms to jiffies.

Signed-off-by: Todor Tomov <todor.tomov@linaro.org>
(cherry picked from commit ad7e386206b243ec61a762e2381d2ba0bfd65273
http://git.linaro.org/landing-teams/working/qualcomm/kernel.git release/qcomlt-4.14)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
---

diff --git a/drivers/i2c/busses/i2c-qcom-cci.c b/drivers/i2c/busses/i2c-qcom-cci.c
index 0aadea11a1ed..7c13a83347db 100644
--- a/drivers/i2c/busses/i2c-qcom-cci.c
+++ b/drivers/i2c/busses/i2c-qcom-cci.c
@@ -423,7 +423,7 @@ static int cci_run_queue(struct cci *cci, u8 master, u8 queue)
 	writel(val, cci->base + CCI_QUEUE_START);
 
 	time = wait_for_completion_timeout(&cci->master[master].irq_complete,
-					   CCI_TIMEOUT_MS);
+					   msecs_to_jiffies(CCI_TIMEOUT_MS));
 	if (!time) {
 		dev_err(cci->dev, "master %d queue %d timeout\n",
 			master, queue);