diff options
| author | Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> | 2014-07-03 16:53:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-10 01:16:07 +0200 |
| commit | 47c6ae7cdc4dc0c72686cca1819c7368bef2e1bf (patch) | |
| tree | 5fcd5fde394d9bacc46735c8a46ea1b69e92ed70 /drivers/usb/host/ehci-mem.c | |
| parent | drivers/usb/host/fhci-dbg.c: remove unnecessary null test before debugfs_remove (diff) | |
| download | linux-47c6ae7cdc4dc0c72686cca1819c7368bef2e1bf.tar.xz linux-47c6ae7cdc4dc0c72686cca1819c7368bef2e1bf.zip | |
USB: EHCI: don't allocate hardware periodic table atomically by default
ehci_mem_init() is executed one time during ehci_init() and by default
all memory allocations but ehci->periodic are done not atomically,
GFP_KERNEL is passed as flags parameter.
Do similar allocation for ehci->periodic and free some space in
coherent atomic DMA pool by default.
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-mem.c')
| -rw-r--r-- | drivers/usb/host/ehci-mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-mem.c b/drivers/usb/host/ehci-mem.c index c0fb6a8ae6a3..b6205fac3567 100644 --- a/drivers/usb/host/ehci-mem.c +++ b/drivers/usb/host/ehci-mem.c @@ -209,7 +209,7 @@ static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags) ehci->periodic = (__le32 *) dma_alloc_coherent (ehci_to_hcd(ehci)->self.controller, ehci->periodic_size * sizeof(__le32), - &ehci->periodic_dma, 0); + &ehci->periodic_dma, flags); if (ehci->periodic == NULL) { goto fail; } |