diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-10 15:14:20 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-10 15:14:20 -0800 |
| commit | a58e928724bfaf77085078fbaa2a19949104f993 (patch) | |
| tree | d53871c0fbe0c4d9a5c89ae5bd857c0d79707866 /drivers/usb | |
| parent | 13840c574ecc47fe8e0388dcd172e04b7ecf8acf (diff) | |
| parent | 9fcbbb97b1f2898fc8d1637487d455e315b8a362 (diff) | |
Merge "USB: gadget: mtp: Make mtp_tx_req_len as Tx transfer length"
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/function/f_mtp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/gadget/function/f_mtp.c b/drivers/usb/gadget/function/f_mtp.c index 5e50fe245a59..ea0f433f989c 100644 --- a/drivers/usb/gadget/function/f_mtp.c +++ b/drivers/usb/gadget/function/f_mtp.c @@ -753,8 +753,8 @@ static ssize_t mtp_write(struct file *fp, const char __user *buf, break; } - if (count > MTP_BULK_BUFFER_SIZE) - xfer = MTP_BULK_BUFFER_SIZE; + if (count > mtp_tx_req_len) + xfer = mtp_tx_req_len; else xfer = count; if (xfer && copy_from_user(req->buf, buf, xfer)) { @@ -850,8 +850,8 @@ static void send_file_work(struct work_struct *data) break; } - if (count > MTP_BULK_BUFFER_SIZE) - xfer = MTP_BULK_BUFFER_SIZE; + if (count > mtp_tx_req_len) + xfer = mtp_tx_req_len; else xfer = count; |