Commit e95f1e0d authored by RD Babiera's avatar RD Babiera Committed by sanglipeng
Browse files

usb: typec: class: fix typec_altmode_put_partner to put plugs 

stable inclusion
from stable-v5.10.204
commit 713f6ff32651d4da07790cce55ab9d5dea9ca3d7
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9J4PL

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=713f6ff32651d4da07790cce55ab9d5dea9ca3d7



--------------------------------

commit b17b7fe6dd5c6ff74b38b0758ca799cdbb79e26e 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 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.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent e2a0fba8

drivers/usb/typec/class.c

+3 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static void typec_altmode_put_partner(struct altmode *altmode) 
	if (!partner)

		return;



	adev = &partner->adev;

	adev = &altmode->adev;



	if (is_typec_plug(adev->dev.parent)) {

		struct typec_plug *plug = to_typec_plug(adev->dev.parent);
@@ -424,6 +424,7 @@ static void typec_altmode_release(struct device *dev) 
{

	struct altmode *alt = to_altmode(to_typec_altmode(dev));



	if (!is_typec_port(dev->parent))

		typec_altmode_put_partner(alt);



	altmode_id_remove(alt->adev.dev.parent, alt->id);