]> git.baikalelectronics.ru Git - kernel.git/commitdiff
usb: typec: Check for ops->exit instead of ops->enter in altmode_exit
authorSven Peter <sven@svenpeter.dev>
Mon, 14 Nov 2022 16:59:24 +0000 (17:59 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jan 2023 10:41:22 +0000 (11:41 +0100)
[ Upstream commit b3c13e0353823603527792e803c897010e588376 ]

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: 7d7a02238dce ("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: Sasha Levin <sashal@kernel.org>
drivers/usb/typec/bus.c

index c950171556d8c8e3c94af8b9beaed7bd85b57c14..0369ad92a1c8eed9d0c35d1ca4748bd7baa2e7a9 100644 (file)
@@ -126,7 +126,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 */