diff options
| author | Russell King | 2013-06-27 13:36:37 +0200 |
|---|---|---|
| committer | Russell King | 2013-10-31 15:49:04 +0100 |
| commit | e1fd7341837238c6c5380c5073887d238f706cf0 (patch) | |
| tree | 16828e0c17a48b42cf0cf2bd219cdf068601f7bd /drivers/usb/host/ehci-omap.c | |
| parent | DMA-API: usb: use dma_set_coherent_mask() (diff) | |
| download | kernel-qcow2-linux-e1fd7341837238c6c5380c5073887d238f706cf0.tar.gz kernel-qcow2-linux-e1fd7341837238c6c5380c5073887d238f706cf0.tar.xz kernel-qcow2-linux-e1fd7341837238c6c5380c5073887d238f706cf0.zip | |
DMA-API: usb: use new dma_coerce_mask_and_coherent()
Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/usb/host/ehci-omap.c')
| -rw-r--r-- | drivers/usb/host/ehci-omap.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index d0759c5c03ab..6fa82d6b7661 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -144,9 +144,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) * Since shared usb code relies on it, set it here for now. * Once we have dma capability bindings this can go away. */ - if (!dev->dma_mask) - dev->dma_mask = &dev->coherent_dma_mask; - ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32)); + ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32)); if (ret) return ret; |