usb: dwc3: core: only setting the dma_mask when needed

If the probe drivers have already set the dma_mask, not
replacing the value.

Signed-off-by: Heikki Krogerus <[email protected]>
Signed-off-by: Felipe Balbi <[email protected]>

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index ddfe7718e4a32c62084c45d59d14a3fe0c6fe93b..13843004815c6b1f110419da28ee14bef7178fb4 100644 (file)
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -715,9 +715,11 @@ static int dwc3_probe(struct platform_device *pdev)
        spin_lock_init(&dwc->lock);
        platform_set_drvdata(pdev, dwc);
 
-       dev->dma_mask   = dev->parent->dma_mask;
-       dev->dma_parms  = dev->parent->dma_parms;
-       dma_set_coherent_mask(dev, dev->parent->coherent_dma_mask);
+       if (!dev->dma_mask) {
+               dev->dma_mask = dev->parent->dma_mask;
+               dev->dma_parms = dev->parent->dma_parms;
+               dma_set_coherent_mask(dev, dev->parent->coherent_dma_mask);
+       }
 
        pm_runtime_enable(dev);
        pm_runtime_get_sync(dev);