| author | Xiaoliang Wang <xiaoliang.wang@amlogic.com> | 2018-10-25 11:50:34 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-10-25 11:50:34 (GMT) |
| commit | e6409ed23a71555615a14db5845590163ebc5dff (patch) | |
| tree | 2ae8e2430cbb22ca051cb77bfe0d8c7dfd6fb4fc | |
| parent | cff9cefdc3d5249c364fc6d1a235aa804e534666 (diff) | |
| parent | 3e1ec9699f37f1deefe94092a7ed70fb8dbbaf71 (diff) | |
| download | common-e6409ed23a71555615a14db5845590163ebc5dff.zip common-e6409ed23a71555615a14db5845590163ebc5dff.tar.gz common-e6409ed23a71555615a14db5845590163ebc5dff.tar.bz2 | |
Merge "usb: patch for adb push fail sometime [1/1]" into p-amlogic
| -rw-r--r-- | drivers/usb/gadget/function/f_fs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index b72bf32..35d66f5 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -294,11 +294,13 @@ struct ffs_data_buffer *ffs_retry_malloc_buffer(struct ffs_data *ffs) pr_info("ffs_retry_malloc_buffer\n"); for (i = 0; i < FFS_BUFFER_MAX; i++) { if (ffs->buffer[i].data_state == -1) { + spin_unlock_irq(&ffs->eps_lock); ffs->buffer[i].data_ep = kzalloc(MAX_PAYLOAD_EPS, GFP_KERNEL); + spin_lock_irq(&ffs->eps_lock); if (!ffs->buffer[i].data_ep) return NULL; - ffs->buffer[i].data_state = 0; + ffs->buffer[i].data_state = 1; return &(ffs->buffer[i]); } } |