summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-07-19 13:56:40 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-07-19 13:59:41 +0200
commit9169d2fd1f5778295ec4934acd99dc7b35a83fd5 (patch)
tree505b9c0c79337041a57c5f9d3c0d2309498f0735 /drivers
parent829b4c4183c2201d2c3981d55bdaeec201ec4098 (diff)
downloadlinux-9169d2fd1f5778295ec4934acd99dc7b35a83fd5.tar.bz2
Revert "platform/chrome: cros_ec_typec: Cleanup switch handle return paths"
This reverts commit 66fe238a9bcc158f75ddecf976d1ce7efe20f713. The chrome platform driver changes need to come in through the platform tree due to some api changes that showed up there that cause build errors in linux-next Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Link: https://lore.kernel.org/r/20220719160821.5e68e30b@oak.ozlabs.ibm.com Cc: Prashant Malani <pmalani@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/chrome/cros_ec_typec.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index 39e6fd4491a9..7cb2e35c4ded 100644
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -157,10 +157,12 @@ static int cros_typec_get_switch_handles(struct cros_typec_port *port,
return 0;
role_sw_err:
- typec_switch_put(port->ori_sw);
+ usb_role_switch_put(port->role_sw);
ori_sw_err:
- typec_mux_put(port->mux);
+ typec_switch_put(port->ori_sw);
mux_err:
+ typec_mux_put(port->mux);
+
return -ENODEV;
}