xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: typec: class: fix typec_altmode_put_partner to put plugs

Browse Source 
commit 5962ded777d689cd8bf04454273e32228d7fb71f upstream.

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 is a plug evaluates
against the released altmode's partner instead of the calling altmode, so
change adev in typec_altmode_put_partner to properly refer to the altmode
being released.

Because typec_altmode_set_partner calls get_device() on the port altmode,
add partner_adev that points to the port altmode in typec_put_partner to
call put_device() on. typec_altmode_set_partner is not called for port
altmodes, so add a check in typec_altmode_release to prevent
typec_altmode_put_partner() calls on port altmode release.

Fixes: 8a37d87d72 ("usb: typec: Bus type for alternate modes")
Cc:  <stable@vger.kernel.org>
Co-developed-by: Christian A. Ehrhardt <lk@c--e.de>
Signed-off-by: Christian A. Ehrhardt <lk@c--e.de>
Signed-off-by: RD Babiera <rdbabiera@google.com>
Tested-by: Christian A. Ehrhardt <lk@c--e.de>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20240103181754.2492492-2-rdbabiera@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
RD Babiera
2024-01-03 18:17:55 +00:00
committed by Greg Kroah-Hartman
parent baaa6d8e3f
commit 5e5ab50eff
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/usb/typec/class.c
View File

@@ -190,11 +190,13 @@ static void typec_altmode_put_partner(struct altmode *altmode)
{ {
struct altmode *partner = altmode->partner; struct altmode *partner = altmode->partner;
struct typec_altmode *adev; struct typec_altmode *adev;
struct typec_altmode *partner_adev;
if (!partner) if (!partner)
return; return;
adev = &partner->adev; adev = &altmode->adev;
partner_adev = &partner->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);
@@ -203,7 +205,7 @@ static void typec_altmode_put_partner(struct altmode *altmode)
} else { } else {
partner->partner = NULL; partner->partner = NULL;
} }
put_device(&adev->dev); put_device(&partner_adev->dev);
} }
/** /**
@@ -424,7 +426,8 @@ 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));
typec_altmode_put_partner(alt); if (!is_typec_port(dev->parent))
typec_altmode_put_partner(alt);
altmode_id_remove(alt->adev.dev.parent, alt->id); altmode_id_remove(alt->adev.dev.parent, alt->id);
kfree(alt); kfree(alt);