Skip to content

Commit 71c47ad

Browse files
superna9999gregkh
authored andcommitted
usb: typec: ucsi: move typec_set_mode(TYPEC_STATE_SAFE) to ucsi_unregister_partner()
It's better to set TYPEC_STATE_SAFE mode from ucsi_unregister_partner() instead of ucsi_partner_change(), ucsi_unregister_partner() is always when the partner disconnects. Fixes: 25a2bc2 ("usb: typec: ucsi: call typec_set_mode on non-altmode partner change") Suggested-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://lore.kernel.org/r/20230626-topic-sm8550-usb-c-audio-fixup-v1-1-bc72fddf3f42@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent c55afcb commit 71c47ad

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/usb/typec/ucsi/ucsi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,8 @@ static void ucsi_unregister_partner(struct ucsi_connector *con)
785785
if (!con->partner)
786786
return;
787787

788+
typec_set_mode(con->port, TYPEC_STATE_SAFE);
789+
788790
ucsi_unregister_partner_pdos(con);
789791
ucsi_unregister_altmodes(con, UCSI_RECIPIENT_SOP);
790792
typec_unregister_partner(con->partner);
@@ -825,8 +827,6 @@ static void ucsi_partner_change(struct ucsi_connector *con)
825827
UCSI_CONSTAT_PARTNER_FLAG_USB)
826828
typec_set_mode(con->port, TYPEC_STATE_USB);
827829
}
828-
} else {
829-
typec_set_mode(con->port, TYPEC_STATE_SAFE);
830830
}
831831

832832
/* Only notify USB controller if partner supports USB data */

0 commit comments

Comments
 (0)