Skip to content

Commit

Permalink
PCI: pciehp: Fix pcie_wait_cmd() timeout
Browse files Browse the repository at this point in the history
pcie_poll_cmd() take msecs instead of jiffies, so convert timeout to msecs.

Fixes: 40b9608 ("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>
  • Loading branch information
Yinghai Lu authored and Bjorn Helgaas committed Sep 23, 2014
1 parent 12d8706 commit 7cbeb9f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/pci/hotplug/pciehp_hpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7cbeb9f

Please sign in to comment.