diff options
author | Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> | 2014-07-03 14:37:41 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-09 19:16:07 -0400 |
commit | 4428524d8d01afae18844e73f330d2e8431f312e (patch) | |
tree | f30442d9962f8e3531a860b418b88d8992d7d703 /drivers/usb/host/ohci-hcd.c | |
parent | f589b3e0408ccebfac98f6c2eb38d445a9423e7c (diff) |
USB: OHCI: don't allocate HCCA atomically
OHCI HCCA memory region is allocated from atomic DMA pool one time
during usb_add_hcd() and deallocated by usb_remove_hcd().
Do non-atomic allocation of OHCI HCCA and free some space in
coherent atomic DMA pool.
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/ohci-hcd.c')
-rw-r--r-- | drivers/usb/host/ohci-hcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index f98d03f3144c..6f8ec52c7e0c 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
@@ -559,7 +559,7 @@ static int ohci_init (struct ohci_hcd *ohci) | |||
559 | return 0; | 559 | return 0; |
560 | 560 | ||
561 | ohci->hcca = dma_alloc_coherent (hcd->self.controller, | 561 | ohci->hcca = dma_alloc_coherent (hcd->self.controller, |
562 | sizeof *ohci->hcca, &ohci->hcca_dma, 0); | 562 | sizeof(*ohci->hcca), &ohci->hcca_dma, GFP_KERNEL); |
563 | if (!ohci->hcca) | 563 | if (!ohci->hcca) |
564 | return -ENOMEM; | 564 | return -ENOMEM; |
565 | 565 | ||