From b538a88579a43fec06e7ab7c34c7eb4526b6e54a Mon Sep 17 00:00:00 2001 From: Li Jun Date: Mon, 22 Sep 2014 22:16:52 +0800 Subject: ENGR00332496 Revert "ENGR00313729 usb: class: acm: use nonbufferable memory for rx dma buffer" Since we already use non-bufferable dma memory for all usb host dma memory allocations which can cover all class drivers, so revert this commmit. This reverts commit e314064d431d32a5a81da6681f57cdb3c20cad5b. Signed-off-by: Li Jun --- drivers/usb/class/cdc-acm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/usb/class/cdc-acm.c') diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 5a97ff143fc3..84e69ea2309b 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1134,8 +1134,8 @@ made_compressed_probe: struct acm_rb *rb = &(acm->read_buffers[i]); struct urb *urb; - rb->base = usb_alloc_nonbufferable(acm->dev, readsize, - GFP_KERNEL, &rb->dma); + rb->base = usb_alloc_coherent(acm->dev, readsize, GFP_KERNEL, + &rb->dma); if (!rb->base) { dev_err(&intf->dev, "out of memory " "(read bufs usb_alloc_coherent)\n"); -- cgit v1.2.3