D32246.diff
No OneTemporary
Actions

Size

675 B

Referenced Files

None

Subscribers

None

D32246.diff
View Options

	diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
	--- a/sys/dev/nvme/nvme_ctrlr.c
	+++ b/sys/dev/nvme/nvme_ctrlr.c
	@@ -262,7 +262,7 @@
	static int
	nvme_ctrlr_wait_for_ready(struct nvme_controller *ctrlr, int desired_val)
	{
	- int timeout = ticks + (uint64_t)ctrlr->ready_timeout_in_ms * hz / 1000;
	+ int timeout = ticks + MSEC_2_TICKS(ctrlr->ready_timeout_in_ms);
	uint32_t csts;

	while (1) {
	@@ -326,7 +326,7 @@
	* cope with these issues.
	*/
	if (ctrlr->quirks & QUIRK_DELAY_B4_CHK_RDY)
	- pause("nvmeR", B4_CHK_RDY_DELAY_MS * hz / 1000);
	+ pause("nvmeR", MSEC_2_TICKS(B4_CHK_RDY_DELAY_MS));
	return (nvme_ctrlr_wait_for_ready(ctrlr, 0));
	}