Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
usb
/
gadget
/
legacy
/
multi.c
diff --git
a/kernel/drivers/usb/gadget/legacy/multi.c
b/kernel/drivers/usb/gadget/legacy/multi.c
index
4fe794d
..
09c7c28
100644
(file)
--- a/
kernel/drivers/usb/gadget/legacy/multi.c
+++ b/
kernel/drivers/usb/gadget/legacy/multi.c
@@
-137,7
+137,6
@@
static struct usb_function *f_msg_rndis;
static int rndis_do_config(struct usb_configuration *c)
{
static int rndis_do_config(struct usb_configuration *c)
{
- struct fsg_opts *fsg_opts;
int ret;
if (gadget_is_otg(c->cdev->gadget)) {
int ret;
if (gadget_is_otg(c->cdev->gadget)) {
@@
-169,11
+168,6
@@
static int rndis_do_config(struct usb_configuration *c)
goto err_fsg;
}
goto err_fsg;
}
- fsg_opts = fsg_opts_from_func_inst(fi_msg);
- ret = fsg_common_run_thread(fsg_opts->common);
- if (ret)
- goto err_run;
-
ret = usb_add_function(c, f_msg_rndis);
if (ret)
goto err_run;
ret = usb_add_function(c, f_msg_rndis);
if (ret)
goto err_run;
@@
-225,7
+219,6
@@
static struct usb_function *f_msg_multi;
static int cdc_do_config(struct usb_configuration *c)
{
static int cdc_do_config(struct usb_configuration *c)
{
- struct fsg_opts *fsg_opts;
int ret;
if (gadget_is_otg(c->cdev->gadget)) {
int ret;
if (gadget_is_otg(c->cdev->gadget)) {
@@
-258,11
+251,6
@@
static int cdc_do_config(struct usb_configuration *c)
goto err_fsg;
}
goto err_fsg;
}
- fsg_opts = fsg_opts_from_func_inst(fi_msg);
- ret = fsg_common_run_thread(fsg_opts->common);
- if (ret)
- goto err_run;
-
ret = usb_add_function(c, f_msg_multi);
if (ret)
goto err_run;
ret = usb_add_function(c, f_msg_multi);
if (ret)
goto err_run;