diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-10 06:45:58 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-10 06:45:58 -0800 |
| commit | 00b3ef62c0c960605ec906ab7f3151d79daf0ae5 (patch) | |
| tree | e123a938129e94844eec635c07f5e70b41c3505d /drivers/usb/gadget/function | |
| parent | 9be7e2fad6655048f355db4217f1b13c1520ce64 (diff) | |
| parent | a799a397d20ee441167d7e686c519b6584600389 (diff) | |
Merge "USB: qc_rndis: Fix aggregation parameters settings issue"
Diffstat (limited to 'drivers/usb/gadget/function')
| -rw-r--r-- | drivers/usb/gadget/function/f_qc_rndis.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/function/rndis.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_qc_rndis.c b/drivers/usb/gadget/function/f_qc_rndis.c index 061095b78c37..baffff7e52e9 100644 --- a/drivers/usb/gadget/function/f_qc_rndis.c +++ b/drivers/usb/gadget/function/f_qc_rndis.c @@ -1257,7 +1257,7 @@ usb_function *rndis_qc_bind_config_vendor(struct usb_function_instance *fi, static struct usb_function *qcrndis_alloc(struct usb_function_instance *fi) { - return rndis_qc_bind_config_vendor(fi, 0, NULL, 1, 0); + return rndis_qc_bind_config_vendor(fi, 0, NULL, 0, 0); } static int rndis_qc_open_dev(struct inode *ip, struct file *fp) diff --git a/drivers/usb/gadget/function/rndis.c b/drivers/usb/gadget/function/rndis.c index 93262f3034d1..b2f082d64855 100644 --- a/drivers/usb/gadget/function/rndis.c +++ b/drivers/usb/gadget/function/rndis.c @@ -816,6 +816,7 @@ int rndis_msg_parser(struct rndis_params *params, u8 *buf) case RNDIS_MSG_INIT: pr_debug("%s: RNDIS_MSG_INIT\n", __func__); + tmp++; /* to get RequestID */ major = get_unaligned_le32(tmp++); minor = get_unaligned_le32(tmp++); max_transfer_size = get_unaligned_le32(tmp++); |