diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-01 14:49:12 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-01 14:49:12 -0700 |
| commit | 6399232feb64816b28e2a01ee874ace1a6975c99 (patch) | |
| tree | 2a46613c494e2a9b2908c993181122628a2e7458 /include | |
| parent | Linux 4.7-rc1 (diff) | |
| parent | usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command (diff) | |
Merge tag 'fixes-for-v4.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
Here's the first set of fixes for v4.7-rc
cycle. Nothing extra fancy this time around.
Patches range from MS OS Descriptor usage fixes, to
Clear Stall EP command fix on dwc3, to some f_fs
fixes and out of bounds accesses on renesas driver.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/gadget.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index 457651bf45b0..fefe8b06a63d 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -1034,6 +1034,8 @@ static inline int usb_gadget_activate(struct usb_gadget *gadget) * @udc_name: A name of UDC this driver should be bound to. If udc_name is NULL, * this driver will be bound to any available UDC. * @pending: UDC core private data used for deferred probe of this driver. + * @match_existing_only: If udc is not found, return an error and don't add this + * gadget driver to list of pending driver * * Devices are disabled till a gadget driver successfully bind()s, which * means the driver will handle setup() requests needed to enumerate (and @@ -1097,6 +1099,7 @@ struct usb_gadget_driver { char *udc_name; struct list_head pending; + unsigned match_existing_only:1; }; |