From ef15d9cac97d1c74a07cae92014224592dae2cc3 Mon Sep 17 00:00:00 2001 From: Andrew Bresticker Date: Thu, 25 Feb 2016 14:51:59 -0800 Subject: [PATCH] Revert "HACK: f_fs: allocate DMA capable req buffer" 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 Reviewed-on: https://chromium-review.googlesource.com/329381 Reviewed-by: Benson Leung (cherry picked from commit 5ba5f62ca8abc13432aa4cbd1ddf92e842677309) Reviewed-on: https://chromium-review.googlesource.com/329361 --- drivers/usb/gadget/function/f_fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index 282d94d4b5b5c..d29807de32fdd 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) {