Skip to content

Commit

Permalink
usb: host: fsl-mph-dr-of: check return of dma_set_mask()
Browse files Browse the repository at this point in the history
commit 3cd54a6 upstream.

fsl_usb2_device_register() should stop init if dma_set_mask() return
error.

Fixes: cae0586 ("drivers/usb/host: fsl: Set DMA_MASK of usb platform device")
Reviewed-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
Link: https://lore.kernel.org/r/20201010060308.33693-1-ran.wang_1@nxp.com
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
RanWang1 authored and gregkh committed Nov 5, 2020
1 parent 75d0d4f commit 94478c1
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions drivers/usb/host/fsl-mph-dr-of.c
Expand Up @@ -94,10 +94,13 @@ static struct platform_device *fsl_usb2_device_register(

pdev->dev.coherent_dma_mask = ofdev->dev.coherent_dma_mask;

if (!pdev->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));
} else {
retval = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
if (retval)
goto error;
}

retval = platform_device_add_data(pdev, pdata, sizeof(*pdata));
if (retval)
Expand Down

0 comments on commit 94478c1

Please sign in to comment.