diff options
| author | Ran Wang <ran.wang_1@nxp.com> | 2020-10-10 14:03:08 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-10 10:23:57 +0100 |
| commit | 31affb07c4f4f66c1a4c71253bec2f4bd894e02e (patch) | |
| tree | e67c70aa96d7ffc5bcc2cb71b4cc0ef5c5a69842 /drivers | |
| parent | 054ace8119b2043cc1661bac82af2a9a505e4e0f (diff) | |
| download | linux-stable-31affb07c4f4f66c1a4c71253bec2f4bd894e02e.tar.gz linux-stable-31affb07c4f4f66c1a4c71253bec2f4bd894e02e.tar.bz2 linux-stable-31affb07c4f4f66c1a4c71253bec2f4bd894e02e.zip | |
usb: host: fsl-mph-dr-of: check return of dma_set_mask()
commit 3cd54a618834430a26a648d880dd83d740f2ae30 upstream.
fsl_usb2_device_register() should stop init if dma_set_mask() return
error.
Fixes: cae058610465 ("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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/fsl-mph-dr-of.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c index f07ccb25bc24..6f006cbf1f83 100644 --- a/drivers/usb/host/fsl-mph-dr-of.c +++ b/drivers/usb/host/fsl-mph-dr-of.c @@ -98,10 +98,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) |