diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-08 09:47:16 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-08 09:47:16 +0200 |
commit | 58318cd4df415aaeaad1a7306cf1d35dad9a21c3 (patch) | |
tree | 794fef2338813360e0f535511f7d6f97a08254f0 /drivers/usb/typec/tcpm.c | |
parent | dcadfaf2127e067e87843ff688f4ae5674a8d607 (diff) | |
parent | 75bc37fefc4471e718ba8e651aa74673d4e0a9eb (diff) | |
download | linux-58318cd4df415aaeaad1a7306cf1d35dad9a21c3.tar.bz2 |
Merge 4.17-rc4 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/typec/tcpm.c')
-rw-r--r-- | drivers/usb/typec/tcpm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c index 7ee417a525c3..72996cca0fe5 100644 --- a/drivers/usb/typec/tcpm.c +++ b/drivers/usb/typec/tcpm.c @@ -4652,6 +4652,7 @@ void tcpm_unregister_port(struct tcpm_port *port) for (i = 0; i < ARRAY_SIZE(port->port_altmode); i++) typec_unregister_altmode(port->port_altmode[i]); typec_unregister_port(port->typec_port); + usb_role_switch_put(port->role_sw); tcpm_debugfs_exit(port); destroy_workqueue(port->wq); } |