]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drivers/usb/host: fsl: Set DMA_MASK of usb platform device
authorSriram Dash <sriram.dash@freescale.com>
Thu, 17 Dec 2015 11:32:35 +0000 (17:02 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Jan 2016 04:37:47 +0000 (20:37 -0800)
Set DMA_MASK of usb platform device properly.

Signed-off-by: Sriram Dash <sriram.dash@freescale.com>
Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/fsl-mph-dr-of.c

index 0c382652a3991fdd26cd5316b2eab9720d72b010..1044b0f9d656f122f4bf3a994465147683f9b05f 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/of_platform.h>
 #include <linux/clk.h>
 #include <linux/module.h>
+#include <linux/dma-mapping.h>
 
 struct fsl_usb2_dev_data {
        char *dr_mode;          /* controller mode */
@@ -96,7 +97,11 @@ static struct platform_device *fsl_usb2_device_register(
        pdev->dev.parent = &ofdev->dev;
 
        pdev->dev.coherent_dma_mask = ofdev->dev.coherent_dma_mask;
-       *pdev->dev.dma_mask = *ofdev->dev.dma_mask;
+
+       if (!pdev->dev.dma_mask)
+               pdev->dev.dma_mask = &ofdev->dev.coherent_dma_mask;
+       else
+               dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
 
        retval = platform_device_add_data(pdev, pdata, sizeof(*pdata));
        if (retval)