aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/roles/class.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-16 09:08:51 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-16 09:08:51 +0100
commit94e14da890b1b68526b5f87ff1c97f374fd2471e (patch)
treead17c794208b02cd2ae24d67ab7e9c14c2fd43c5 /drivers/usb/roles/class.c
parent5367601b52696004f363e4f6c0b228b5bbf7d8b7 (diff)
parentd1eef1c619749b2a57e514a3fa67d9a516ffa919 (diff)
Merge 5.5-rc2 into driver-core-next
We need the driver core fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/roles/class.c')
-rw-r--r--drivers/usb/roles/class.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/roles/class.c b/drivers/usb/roles/class.c
index 8273126ffdf4..63a00ff26655 100644
--- a/drivers/usb/roles/class.c
+++ b/drivers/usb/roles/class.c
@@ -169,8 +169,8 @@ EXPORT_SYMBOL_GPL(fwnode_usb_role_switch_get);
void usb_role_switch_put(struct usb_role_switch *sw)
{
if (!IS_ERR_OR_NULL(sw)) {
- put_device(&sw->dev);
module_put(sw->dev.parent->driver->owner);
+ put_device(&sw->dev);
}
}
EXPORT_SYMBOL_GPL(usb_role_switch_put);