Commit 41e1cd14 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Greg Kroah-Hartman

usb: typec: ucsi: simplify partner's PD caps registration

In a way similar to the previous commit, move
typec_partner_set_usb_power_delivery() to be called after reading the PD
caps. This also removes calls to
usb_power_delivery_unregister_capabilities() from the error path. Keep
all capabilities registered until they are cleared by
ucsi_unregister_partner_pdos().

Fixes: b04e1747 ("usb: typec: ucsi: Register USB Power Delivery Capabilities")
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20240329-qcom-ucsi-fixes-v2-5-0f5d37ed04db@linaro.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c0f66d78
...@@ -826,12 +826,6 @@ static int ucsi_register_partner_pdos(struct ucsi_connector *con) ...@@ -826,12 +826,6 @@ static int ucsi_register_partner_pdos(struct ucsi_connector *con)
return PTR_ERR(cap); return PTR_ERR(cap);
con->partner_source_caps = cap; con->partner_source_caps = cap;
ret = typec_partner_set_usb_power_delivery(con->partner, con->partner_pd);
if (ret) {
usb_power_delivery_unregister_capabilities(con->partner_source_caps);
return ret;
}
} }
ret = ucsi_get_pdos(con, TYPEC_SINK, 1, caps.pdo); ret = ucsi_get_pdos(con, TYPEC_SINK, 1, caps.pdo);
...@@ -846,15 +840,9 @@ static int ucsi_register_partner_pdos(struct ucsi_connector *con) ...@@ -846,15 +840,9 @@ static int ucsi_register_partner_pdos(struct ucsi_connector *con)
return PTR_ERR(cap); return PTR_ERR(cap);
con->partner_sink_caps = cap; con->partner_sink_caps = cap;
ret = typec_partner_set_usb_power_delivery(con->partner, con->partner_pd);
if (ret) {
usb_power_delivery_unregister_capabilities(con->partner_sink_caps);
return ret;
}
} }
return 0; return typec_partner_set_usb_power_delivery(con->partner, con->partner_pd);
} }
static void ucsi_unregister_partner_pdos(struct ucsi_connector *con) static void ucsi_unregister_partner_pdos(struct ucsi_connector *con)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment