[PATCH] usb: typec: ucsi: Fix missing typec_unregister_port on error paths
From: Haotian Zhang
Date: Mon Nov 24 2025 - 07:23:03 EST
The ucsi_register_port() registers a Type-C port with
typec_register_port(), but several error paths after a successful
registration returned directly to cleanup without calling
typec_unregister_port(). This lead to a potential resource leak.
Add a common error-unwind path that calls typec_unregister_port()
for all failures to ensure proper cleanup.
Fixes: c1b0bc2dabfa ("usb: typec: Add support for UCSI interface")
Signed-off-by: Haotian Zhang <vulab@xxxxxxxxxxx>
---
drivers/usb/typec/ucsi/ucsi.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index 3f568f790f39..096c4911e8bf 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -1656,14 +1656,14 @@ static int ucsi_register_port(struct ucsi *ucsi, struct ucsi_connector *con)
if (ret) {
dev_err(ucsi->dev, "con%d: failed to register alt modes\n",
con->num);
- goto out;
+ goto out_unregister;
}
/* Get the status */
ret = ucsi_get_connector_status(con, false);
if (ret) {
dev_err(ucsi->dev, "con%d: failed to get status\n", con->num);
- goto out;
+ goto out_unregister;
}
if (ucsi->ops->connector_status)
@@ -1717,6 +1717,10 @@ static int ucsi_register_port(struct ucsi *ucsi, struct ucsi_connector *con)
trace_ucsi_register_port(con->num, con);
+ goto out;
+
+out_unregister:
+ typec_unregister_port(con->port);
out:
fwnode_handle_put(cap->fwnode);
out_unlock:
--
2.25.1