| author | Xiaoliang Wang <xiaoliang.wang@amlogic.com> | 2018-10-20 08:54:09 (GMT) |
|---|---|---|
| committer | Xiaoliang Wang <xiaoliang.wang@amlogic.com> | 2018-10-20 08:54:09 (GMT) |
| commit | 6287532fbc94df19f5fb62038ebd7f9a825ece1c (patch) | |
| tree | e159946adf1052adc3b8b31725c44b3e3b975303 | |
| parent | ea36cc268d75799a5e75b9478918d92d17b28f86 (diff) | |
| download | common-6287532fbc94df19f5fb62038ebd7f9a825ece1c.zip common-6287532fbc94df19f5fb62038ebd7f9a825ece1c.tar.gz common-6287532fbc94df19f5fb62038ebd7f9a825ece1c.tar.bz2 | |
Revert "usb: adb reboot and then adb disconnect[1/1]"
This reverts commit ea36cc268d75799a5e75b9478918d92d17b28f86.
Change-Id: I13a59b966a11c56557123fb35c665fe306be2e1a
| -rw-r--r-- | drivers/usb/gadget/function/f_fs.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index cb76db3..055c03a 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -848,9 +848,7 @@ static void ffs_user_copy_worker(struct work_struct *work) if (io_data->read) kfree(io_data->to_free); -#ifndef CONFIG_AMLOGIC_USB kfree(io_data->buf); -#endif kfree(io_data); } @@ -954,6 +952,7 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data) #ifdef CONFIG_AMLOGIC_USB struct ffs_ep *ep = epfile->ep; struct ffs_data_buffer *buffer = NULL; + int data_flag = -1; #else struct ffs_ep *ep; #endif @@ -1035,6 +1034,15 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data) goto error_mutex; } #else + if (io_data->aio) { + spin_unlock_irq(&epfile->ffs->eps_lock); + data = kmalloc(data_len, GFP_KERNEL); + data_flag = 1; + if (unlikely(!data)) { + ret = -ENOMEM; + goto error_mutex; + } + } else { /* Fire the request */ /* * Avoid kernel panic caused by race condition. For example, @@ -1052,9 +1060,9 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data) * To avoid this, during FunctionFS mount, we allocated the * data buffer for requests. And the memory resources has * been released in kill_sb. - *reboot adb disconnect,so buffer aways used assign_ffs_buffer. */ buffer = assign_ffs_buffer(epfile->ffs); + data_flag = -1; if (unlikely(!buffer)) { ret = -ENOMEM; spin_unlock_irq(&epfile->ffs->eps_lock); @@ -1063,6 +1071,7 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data) data = buffer->data_ep; spin_unlock_irq(&epfile->ffs->eps_lock); + } #endif if (!io_data->read && @@ -1168,8 +1177,13 @@ error_mutex: mutex_unlock(&epfile->mutex); error: #ifdef CONFIG_AMLOGIC_USB - if (buffer) - release_ffs_buffer(epfile->ffs, buffer); + if (data_flag > 0) { + kfree(data); + data = NULL; + } else { + if (buffer) + release_ffs_buffer(epfile->ffs, buffer); + } #else kfree(data); #endif |