diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-03 16:35:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-03 16:35:26 +0200 |
| commit | b9c92fb4aabb8d93b657d028f7c530d6c42cb630 (patch) | |
| tree | 8fdb7274eee9e5a9b619979988171bce6725369b /drivers/usb/gadget/configfs.c | |
| parent | usb: core: hcd: Create platform devices for onboard hubs in probe() (diff) | |
| parent | Linux 5.18-rc5 (diff) | |
| download | linux-b9c92fb4aabb8d93b657d028f7c530d6c42cb630.tar.xz linux-b9c92fb4aabb8d93b657d028f7c530d6c42cb630.zip | |
Merge 5.18-rc5 into usb-next
We need the USB fixes in here, and this resolves a merge issue in
drivers/usb/dwc3/drd.c
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/gadget/configfs.c')
| -rw-r--r-- | drivers/usb/gadget/configfs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c index 4141206bb0ed..3a6b4926193e 100644 --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c @@ -1438,6 +1438,8 @@ static void configfs_composite_unbind(struct usb_gadget *gadget) usb_ep_autoconfig_reset(cdev->gadget); spin_lock_irqsave(&gi->spinlock, flags); cdev->gadget = NULL; + cdev->deactivations = 0; + gadget->deactivated = false; set_gadget_data(gadget, NULL); spin_unlock_irqrestore(&gi->spinlock, flags); } |