]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
i2c-qcom-cci: Fix run queue completion timeout
authorTodor Tomov <todor.tomov@linaro.org>
Wed, 13 Dec 2017 15:24:33 +0000 (17:24 +0200)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Wed, 11 Apr 2018 16:43:53 +0000 (13:43 -0300)
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>
drivers/i2c/busses/i2c-qcom-cci.c

index 0aadea11a1ed9ab61520a79364111903c2acc824..7c13a83347dbd561c29f4b624af5da1eaa951d7a 100644 (file)
@@ -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);