diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 10:11:25 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 10:11:25 +0300 |
| commit | 1c816bad41fea5470e8077ae4e661f3f9b5ada64 (patch) | |
| tree | 5e923d12b6284a711d66efee822ca48f95ebf1af /drivers/usb/gadget/udc/dummy_hcd.c | |
| parent | b0fe8f7b9b5adea2c85c72bba46e20fb21522769 (diff) | |
| parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
| download | linux-1c816bad41fea5470e8077ae4e661f3f9b5ada64.tar.xz | |
Merge 4.11-rc4 into staging-next
We need the IIO fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/gadget/udc/dummy_hcd.c')
| -rw-r--r-- | drivers/usb/gadget/udc/dummy_hcd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c index c60abe3a68f9..8cabc5944d5f 100644 --- a/drivers/usb/gadget/udc/dummy_hcd.c +++ b/drivers/usb/gadget/udc/dummy_hcd.c @@ -1031,6 +1031,8 @@ static int dummy_udc_probe(struct platform_device *pdev) int rc; dum = *((void **)dev_get_platdata(&pdev->dev)); + /* Clear usb_gadget region for new registration to udc-core */ + memzero_explicit(&dum->gadget, sizeof(struct usb_gadget)); dum->gadget.name = gadget_name; dum->gadget.ops = &dummy_ops; dum->gadget.max_speed = USB_SPEED_SUPER; |