Skip to content

Commit 3cd54a6

Browse files
RanWang1gregkh
authored andcommitted
usb: host: fsl-mph-dr-of: check return of dma_set_mask()
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>
1 parent cbdc0f5 commit 3cd54a6

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

drivers/usb/host/fsl-mph-dr-of.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,13 @@ static struct platform_device *fsl_usb2_device_register(
9494

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

97-
if (!pdev->dev.dma_mask)
97+
if (!pdev->dev.dma_mask) {
9898
pdev->dev.dma_mask = &ofdev->dev.coherent_dma_mask;
99-
else
100-
dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
99+
} else {
100+
retval = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
101+
if (retval)
102+
goto error;
103+
}
101104

102105
retval = platform_device_add_data(pdev, pdata, sizeof(*pdata));
103106
if (retval)

0 commit comments

Comments
 (0)