diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-07-08 13:15:57 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-07-14 12:14:27 -0400 |
| commit | f3cf800778e9e76b2387d00c9bfbc2e16efdb7ed (patch) | |
| tree | 783e27546a8d65df254f59b5a024dc42eb390582 /drivers/usb/gadget/function/f_subset.c | |
| parent | b8917b4ae44d1b945f6fba3d8ee6777edb44633b (diff) | |
| parent | cd4220d23bf3f43cf720e82bdee681f383433ae2 (diff) | |
Merge tag 'kvm-s390-master-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: selftests: Fixes
- provide memory model for IBM z196 and zEC12
- do not require 64GB of memory
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 4d945254905d..51c1cae162d9 100644 --- a/drivers/usb/gadget/function/f_subset.c +++ b/drivers/usb/gadget/function/f_subset.c @@ -358,7 +358,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, NULL); + ss_eth_function, ss_eth_function); if (status) goto fail; |