summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-atmel.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-06-10 16:28:49 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-10-31 14:49:01 +0000
commit22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b (patch)
tree08dac036c1fdeb9c49940b3a7760860849eee65c /drivers/usb/host/ehci-atmel.c
parent93b11b2584ab6832cb279db731daa58442baac65 (diff)
downloadlinux-22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b.tar.gz
linux-22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b.tar.bz2
linux-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/ehci-atmel.c')
-rw-r--r--drivers/usb/host/ehci-atmel.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 3b645ff46f7b..5831a88623e4 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -92,8 +92,9 @@ static int ehci_atmel_drv_probe(struct platform_device *pdev)
*/
if (!pdev->dev.dma_mask)
pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
- if (!pdev->dev.coherent_dma_mask)
- pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+ retval = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+ if (retval)
+ goto fail_create_hcd;
hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
if (!hcd) {