From: Imre Deak <imre.deak@intel.com>
Date: Wed, 3 Jun 2020 21:10:39 +0000 (+0300)
Subject: drm/dp_mst: Sanitize mgr->qlock locking in drm_dp_mst_wait_tx_reply()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8b9f3437ff5b5d059f70f9ce44d169b0cc5650ee;p=linux.git

drm/dp_mst: Sanitize mgr->qlock locking in drm_dp_mst_wait_tx_reply()

Make the locking look symmetric with the unlocking.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200603211040.8190-2-imre.deak@intel.com
---

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index cb4140dad4863..469d3569d5caf 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -1183,7 +1183,7 @@ static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb,
 	ret = wait_event_timeout(mgr->tx_waitq,
 				 check_txmsg_state(mgr, txmsg),
 				 (4 * HZ));
-	mutex_lock(&mstb->mgr->qlock);
+	mutex_lock(&mgr->qlock);
 	if (ret > 0) {
 		if (txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT) {
 			ret = -EIO;