diff options
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/uhci-hcd.c | 6 | ||||
| -rw-r--r-- | drivers/usb/host/xhci-mem.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index 6218bfe54f52..98deb5f64268 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c | |||
| @@ -596,9 +596,9 @@ static int uhci_start(struct usb_hcd *hcd) | |||
| 596 | &uhci_debug_operations); | 596 | &uhci_debug_operations); |
| 597 | #endif | 597 | #endif |
| 598 | 598 | ||
| 599 | uhci->frame = dma_zalloc_coherent(uhci_dev(uhci), | 599 | uhci->frame = dma_alloc_coherent(uhci_dev(uhci), |
| 600 | UHCI_NUMFRAMES * sizeof(*uhci->frame), | 600 | UHCI_NUMFRAMES * sizeof(*uhci->frame), |
| 601 | &uhci->frame_dma_handle, GFP_KERNEL); | 601 | &uhci->frame_dma_handle, GFP_KERNEL); |
| 602 | if (!uhci->frame) { | 602 | if (!uhci->frame) { |
| 603 | dev_err(uhci_dev(uhci), | 603 | dev_err(uhci_dev(uhci), |
| 604 | "unable to allocate consistent memory for frame list\n"); | 604 | "unable to allocate consistent memory for frame list\n"); |
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index 36a3eb8849f1..8067f178fa84 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c | |||
| @@ -1672,8 +1672,8 @@ static int scratchpad_alloc(struct xhci_hcd *xhci, gfp_t flags) | |||
| 1672 | xhci->dcbaa->dev_context_ptrs[0] = cpu_to_le64(xhci->scratchpad->sp_dma); | 1672 | xhci->dcbaa->dev_context_ptrs[0] = cpu_to_le64(xhci->scratchpad->sp_dma); |
| 1673 | for (i = 0; i < num_sp; i++) { | 1673 | for (i = 0; i < num_sp; i++) { |
| 1674 | dma_addr_t dma; | 1674 | dma_addr_t dma; |
| 1675 | void *buf = dma_zalloc_coherent(dev, xhci->page_size, &dma, | 1675 | void *buf = dma_alloc_coherent(dev, xhci->page_size, &dma, |
| 1676 | flags); | 1676 | flags); |
| 1677 | if (!buf) | 1677 | if (!buf) |
| 1678 | goto fail_sp4; | 1678 | goto fail_sp4; |
| 1679 | 1679 | ||
| @@ -1799,8 +1799,8 @@ int xhci_alloc_erst(struct xhci_hcd *xhci, | |||
| 1799 | struct xhci_erst_entry *entry; | 1799 | struct xhci_erst_entry *entry; |
| 1800 | 1800 | ||
| 1801 | size = sizeof(struct xhci_erst_entry) * evt_ring->num_segs; | 1801 | size = sizeof(struct xhci_erst_entry) * evt_ring->num_segs; |
| 1802 | erst->entries = dma_zalloc_coherent(xhci_to_hcd(xhci)->self.sysdev, | 1802 | erst->entries = dma_alloc_coherent(xhci_to_hcd(xhci)->self.sysdev, |
| 1803 | size, &erst->erst_dma_addr, flags); | 1803 | size, &erst->erst_dma_addr, flags); |
| 1804 | if (!erst->entries) | 1804 | if (!erst->entries) |
| 1805 | return -ENOMEM; | 1805 | return -ENOMEM; |
| 1806 | 1806 | ||
