PCI: pciehp: Fix pcie_wait_cmd() timeout
authorYinghai Lu <yinghai@kernel.org>
Tue, 23 Sep 2014 02:05:45 +0000 (20:05 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 23 Sep 2014 02:05:45 +0000 (20:05 -0600)
pcie_poll_cmd() take msecs instead of jiffies, so convert timeout to msecs.

Fixes: 40b960831cfa ("PCI: pciehp: Compute timeout from hotplug command start time")
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/hotplug/pciehp_hpc.c

index 5e01ae39ec46a29930b3ac21de0d7a3fd3900314..2a412fa3b338f4b8399685c5b46e43a4e925871a 100644 (file)
@@ -160,7 +160,7 @@ static void pcie_wait_cmd(struct controller *ctrl)
            ctrl->slot_ctrl & PCI_EXP_SLTCTL_CCIE)
                rc = wait_event_timeout(ctrl->queue, !ctrl->cmd_busy, timeout);
        else
-               rc = pcie_poll_cmd(ctrl, timeout);
+               rc = pcie_poll_cmd(ctrl, jiffies_to_msecs(timeout));
 
        /*
         * Controllers with errata like Intel CF118 don't generate