diff options
| author | Jae Hyun Yoo <jae.hyun.yoo@intel.com> | 2021-07-01 21:49:45 +0300 |
|---|---|---|
| committer | Jae Hyun Yoo <jae.hyun.yoo@intel.com> | 2021-07-01 21:50:09 +0300 |
| commit | 9ec121d97a292628e01462df8f13b017add3b034 (patch) | |
| tree | f1abf6f81c13ce58bf04abf70e75fcbaf96935c3 /drivers/usb/gadget/function/f_tcm.c | |
| parent | ab0d43fcc078edf3123887f9bff1e8ef7d87e641 (diff) | |
| parent | dd1e9367157f900616f0eae3cef897c23d4e7452 (diff) | |
| download | linux-dev-5.10.46-intel.tar.xz | |
Merge branch 'dev-5.10' into dev-5.10-inteldev-5.10.46-intel
This is the 5.10.46 stable release.
Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
Diffstat (limited to 'drivers/usb/gadget/function/f_tcm.c')
| -rw-r--r-- | drivers/usb/gadget/function/f_tcm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_tcm.c b/drivers/usb/gadget/function/f_tcm.c index 410fa89eae8f..5a2e9ce2bc35 100644 --- a/drivers/usb/gadget/function/f_tcm.c +++ b/drivers/usb/gadget/function/f_tcm.c @@ -2061,7 +2061,8 @@ static int tcm_bind(struct usb_configuration *c, struct usb_function *f) uasp_fs_cmd_desc.bEndpointAddress = uasp_ss_cmd_desc.bEndpointAddress; ret = usb_assign_descriptors(f, uasp_fs_function_desc, - uasp_hs_function_desc, uasp_ss_function_desc, NULL); + uasp_hs_function_desc, uasp_ss_function_desc, + uasp_ss_function_desc); if (ret) goto ep_fail; |