D47419.id.diff
No OneTemporary
Actions

Size

795 B

Referenced Files

None

Subscribers

None

D47419.id.diff
View Options

	diff --git a/sys/dev/firmware/arm/scmi.c b/sys/dev/firmware/arm/scmi.c
	--- a/sys/dev/firmware/arm/scmi.c
	+++ b/sys/dev/firmware/arm/scmi.c
	@@ -545,6 +545,7 @@
	*/
	mtx_lock_spin(&req->mtx);
	needs_drop = (ret == 0) && !req->done;
	+ req->timed_out = ret != 0;
	mtx_unlock_spin(&req->mtx);
	if (needs_drop)
	scmi_req_drop_inflight(sc, req);
	@@ -560,6 +561,7 @@
	mtx_lock_spin(&req->mtx);
	if (ret != 0 && req->done)
	ret = 0;
	+ req->timed_out = ret != 0;
	mtx_unlock_spin(&req->mtx);
	}

	@@ -569,9 +571,6 @@
	ret = req->msg.payld[0];
	*out = &req->msg.payld[SCMI_MSG_HDR_SIZE];
	} else {
	- mtx_lock_spin(&req->mtx);
	- req->timed_out = true;
	- mtx_unlock_spin(&req->mtx);
	device_printf(sc->dev,
	"Request for token 0x%X timed-out.\n", req->token);
	}