diff options
| author | Andrew Bresticker <abrestic@chromium.org> | 2016-02-25 14:51:59 -0800 |
|---|---|---|
| committer | Andrew Bresticker <abrestic@chromium.org> | 2016-02-26 18:05:35 +0000 |
| commit | ef15d9cac97d1c74a07cae92014224592dae2cc3 (patch) | |
| tree | 1e961db4d896f459473b97569f9644d6fe296640 | |
| parent | 77438cebffb1b5e6fe5e9687e5eca2893af5bcf8 (diff) | |
Revert "HACK: f_fs: allocate DMA capable req buffer"android-smaug-3.18-n-preview-1
This hack was originally committed in order to get the legacy USB2.0 UDC
device working without wiring up the IOMMU. Since we're now using the
XUDC device, which supports 64-bit DMA, this hack is no longer needed.
This reverts commit 5f1219ba651c3cf54ced48a28c83e4663b498e1f.
BUG=b:27362803
TEST=Build and boot on Smaug; adb still works.
Change-Id: I72fc38d89b819519dd2a4c9a6f43599431f280f4
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/329381
Reviewed-by: Benson Leung <bleung@chromium.org>
(cherry picked from commit 5ba5f62ca8abc13432aa4cbd1ddf92e842677309)
Reviewed-on: https://chromium-review.googlesource.com/329361
| -rw-r--r-- | drivers/usb/gadget/function/f_fs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index 282d94d4b5b5..d29807de32fd 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -752,7 +752,7 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data) io_data->len; spin_unlock_irq(&epfile->ffs->eps_lock); - data = kmalloc(data_len, GFP_DMA); + data = kmalloc(data_len, GFP_KERNEL); if (unlikely(!data)) return -ENOMEM; if (io_data->aio && !io_data->read) { |