diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-10 16:28:49 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-31 14:49:01 +0000 |
| commit | 22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b (patch) | |
| tree | 08dac036c1fdeb9c49940b3a7760860849eee65c /drivers/usb/host/ohci-omap3.c | |
| parent | 93b11b2584ab6832cb279db731daa58442baac65 (diff) | |
| download | linux-stable-22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b.tar.gz linux-stable-22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b.tar.bz2 linux-stable-22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b.zip | |
DMA-API: usb: use dma_set_coherent_mask()
The correct way for a driver to specify the coherent DMA mask is
not to directly access the field in the struct device, but to use
dma_set_coherent_mask(). Only arch and bus code should access this
member directly.
Convert all direct write accesses to using the correct API.
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/ohci-omap3.c')
| -rw-r--r-- | drivers/usb/host/ohci-omap3.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/host/ohci-omap3.c b/drivers/usb/host/ohci-omap3.c index a09af26f69ed..664f5dc40939 100644 --- a/drivers/usb/host/ohci-omap3.c +++ b/drivers/usb/host/ohci-omap3.c @@ -132,7 +132,7 @@ static int ohci_hcd_omap3_probe(struct platform_device *pdev) struct usb_hcd *hcd = NULL; void __iomem *regs = NULL; struct resource *res; - int ret = -ENODEV; + int ret; int irq; if (usb_disabled()) @@ -168,9 +168,11 @@ static int ohci_hcd_omap3_probe(struct platform_device *pdev) */ if (!dev->dma_mask) dev->dma_mask = &dev->coherent_dma_mask; - if (!dev->coherent_dma_mask) - dev->coherent_dma_mask = DMA_BIT_MASK(32); + ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32)); + if (ret) + goto err_io; + ret = -ENODEV; hcd = usb_create_hcd(&ohci_omap3_hc_driver, dev, dev_name(dev)); if (!hcd) { |