Commit b17b7fe6 authored by RD Babiera's avatar RD Babiera Committed by Greg Kroah-Hartman

usb: typec: class: fix typec_altmode_put_partner to put plugs

When typec_altmode_put_partner is called by a plug altmode upon release,
the port altmode the plug belongs to will not remove its reference to the
plug. The check to see if the altmode being released evaluates against the
released altmode's partner instead of the calling altmode itself, so change
adev in typec_altmode_put_partner to properly refer to the altmode being
released.

typec_altmode_set_partner is not run for port altmodes, so also add a check
in typec_altmode_release to prevent typec_altmode_put_partner() calls on
port altmode release.

Fixes: 8a37d87d ("usb: typec: Bus type for alternate modes")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarRD Babiera <rdbabiera@google.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20231129192349.1773623-2-rdbabiera@google.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 73ea73af
...@@ -267,7 +267,7 @@ static void typec_altmode_put_partner(struct altmode *altmode) ...@@ -267,7 +267,7 @@ static void typec_altmode_put_partner(struct altmode *altmode)
if (!partner) if (!partner)
return; return;
adev = &partner->adev; adev = &altmode->adev;
if (is_typec_plug(adev->dev.parent)) { if (is_typec_plug(adev->dev.parent)) {
struct typec_plug *plug = to_typec_plug(adev->dev.parent); struct typec_plug *plug = to_typec_plug(adev->dev.parent);
...@@ -497,6 +497,7 @@ static void typec_altmode_release(struct device *dev) ...@@ -497,6 +497,7 @@ static void typec_altmode_release(struct device *dev)
{ {
struct altmode *alt = to_altmode(to_typec_altmode(dev)); struct altmode *alt = to_altmode(to_typec_altmode(dev));
if (!is_typec_port(dev->parent))
typec_altmode_put_partner(alt); typec_altmode_put_partner(alt);
altmode_id_remove(alt->adev.dev.parent, alt->id); altmode_id_remove(alt->adev.dev.parent, alt->id);
......
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