[PATCH] usb: typec: ucsi: Unregister lockdep key only after last lock use

[Konrad Dybcio]

From: Konrad Dybcio <konrad.dybcio@xxxxxxxxxxxxxxxx>

ucsi_unregister_port() starts off with taking con->lock. Fix the
ucsi_init() teardown path to avoid unregistering the lockdep key
associated with it right before its use.

Fixes: 7aa7d4bf9d3f ("usb: typec: ucsi: Fix race condition and ordering in port unregistration")
Assisted-by: Codex:GPT-5.5
Signed-off-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxxxxxxxx>
---
To: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
To: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
To: Andrei Kuchynski <akuchynski@xxxxxxxxxxxx>
To: Benson Leung <bleung@xxxxxxxxxxxx>
Cc: linux-usb@xxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
Cc: usb4-upstream@xxxxxxxxxxxxxxxx
Cc: Raghavendra Thoorpu <rthoorpu@xxxxxxxxxxxxxxxx>
---
 drivers/usb/typec/ucsi/ucsi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index d221ca9bc88e..67c75e6bdfae 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -2142,11 +2142,12 @@ static int ucsi_init(struct ucsi *ucsi)
 	return 0;
 
 err_unregister:
+	for (con = connector; con->port; con++)
+		ucsi_unregister_port(con);
+
 	for (i = 0; i < ucsi->cap.num_connectors; i++)
 		lockdep_unregister_key(&connector[i].lock_key);
 
-	for (con = connector; con->port; con++)
-		ucsi_unregister_port(con);
 	kfree(connector);
 err_reset:
 	memset(&ucsi->cap, 0, sizeof(ucsi->cap));

---
base-commit: 0718283ab28bc3907e10b61a6b4be6fefa1cbb2f
change-id: 20260720-topic-ucsi_lockdep-b48ec8de8665

Best regards,
--  
Konrad Dybcio <konrad.dybcio@xxxxxxxxxxxxxxxx>