From b6ddd180e3d9f92c1e482b3cdeec7dda086b1341 Mon Sep 17 00:00:00 2001

From: Sven Peter <sven@svenpeter.dev>

Date: Mon, 14 Nov 2022 17:59:24 +0100

Subject: [PATCH] usb: typec: Check for ops->exit instead of ops->enter in

 altmode_exit

Git-commit: b6ddd180e3d9f92c1e482b3cdeec7dda086b1341

References: git-fixes

Patch-mainline: v6.2-rc1

typec_altmode_exit checks if ops->enter is not NULL but then calls

ops->exit a few lines below. Fix that and check for the function

pointer it's about to call instead.

Fixes: 8a37d87d72f0 ("usb: typec: Bus type for alternate modes")

Signed-off-by: Sven Peter <sven@svenpeter.dev>

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

Link: https://lore.kernel.org/r/20221114165924.33487-1-sven@svenpeter.dev

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Oliver Neukum <oneukum@suse.com>

---

 drivers/usb/typec/bus.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c

index 26ea2fdec17d..31c2a3130cad 100644

--- a/drivers/usb/typec/bus.c

+++ b/drivers/usb/typec/bus.c

@@ -134,7 +134,7 @@ int typec_altmode_exit(struct typec_altmode *adev)

 	if (!adev || !adev->active)

 		return 0;

-	if (!pdev->ops || !pdev->ops->enter)

+	if (!pdev->ops || !pdev->ops->exit)

 		return -EOPNOTSUPP;

 	/* Moving to USB Safe State */

-- 

2.40.0