Commit 7cbeb9f9 authored Sep 22, 2014 by Yinghai Lu Committed by Bjorn Helgaas Sep 22, 2014

PCI: pciehp: Fix pcie_wait_cmd() timeout

pcie_poll_cmd() take msecs instead of jiffies, so convert timeout to msecs.

Fixes: 40b96083 ("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>

parent 12d87069

drivers/pci/hotplug/pciehp_hpc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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