diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-04 18:43:07 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-04 18:43:07 -0800 |
| commit | 3d0712deb0a416021e55febc7ec7f6c24f460e06 (patch) | |
| tree | cf56aba54ac85516fc753b662a1880e8a50ee5d9 /drivers/usb/gadget/function/f_subset.c | |
| parent | 83253b3b0286ab6111e0266da74fb10b7b92746b (diff) | |
| parent | 0561f77e2db9e72dc32e4f82b56fca8ba6b31171 (diff) | |
| download | lwn-3d0712deb0a416021e55febc7ec7f6c24f460e06.tar.gz lwn-3d0712deb0a416021e55febc7ec7f6c24f460e06.zip | |
Merge tag 'usb-for-v4.6' of http://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
usb changes for v4.6 merge window
This is almost all under drivers/usb/dwc2/. Many
changes to the host side implementation of dwc2 have
been done by Douglas Anderson.
We also have USB 3.1 support added to the Gadget
Framework and, because of that work, dwc3 got
support to Synopsys new DWC_usb31 IP core.
Other than these 2 important series, we also have
the usual collection of non-critical fixes,
Documentation updates, and minor changes all over
the place.
Diffstat (limited to 'drivers/usb/gadget/function/f_subset.c')
| -rw-r--r-- | drivers/usb/gadget/function/f_subset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_subset.c b/drivers/usb/gadget/function/f_subset.c index 829c78de9eba..434b983f3b4c 100644 --- a/drivers/usb/gadget/function/f_subset.c +++ b/drivers/usb/gadget/function/f_subset.c @@ -362,7 +362,7 @@ geth_bind(struct usb_configuration *c, struct usb_function *f) fs_subset_out_desc.bEndpointAddress; status = usb_assign_descriptors(f, fs_eth_function, hs_eth_function, - ss_eth_function); + ss_eth_function, NULL); if (status) goto fail; |