usb: host: fsl-mph-dr-of: check return of dma_set_mask()
PATCH 1/1 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 cae058610465 ("drivers/usb/host: fsl: Set DMA_MASK of usb platform device")
Signed-off-by Ran Wang <[email protected]>
--- drivers/usb/host/fsl-mph-dr-of.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/usb/host/fsl-mph-dr-of.c +6 -3
@@ -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)
Signature · 1 line
2.7.4
Quoted 33 lines · Ran Wang
fsl_usb2_device_register()should stop init ifdma_set_mask()return error.Fixes cae058610465 ("drivers/usb/host: fsl: Set DMA_MASK of usb platform device")Signed-off-by Ran Wang <[email protected]>--- drivers/usb/host/fsl-mph-dr-of.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/usb/host/fsl-mph-dr-of.c +6
-3@@ -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)Signature · 1 line
2.7.4
Reviewed-by Peter Chen <[email protected]>
One more place need to fix, if platform_device_alloc returns NULL, it should not call platform_device_put to release platform device memory.
pdev = platform_device_alloc(name, id);
if (!pdev) {
retval = -ENOMEM;
goto error;
}
...
error:
platform_device_put(pdev);
return ERR_PTR(retval);Signature · 2 lines
Thanks, Peter Chen
Hi Peter,
Quoted 45 lines · Peter Chen
Quoted 32 lines · Ran Wang
fsl_usb2_device_register()should stop init ifdma_set_mask()return error.Fixes cae058610465 ("drivers/usb/host: fsl: Set DMA_MASK of usbplatform device")
Signed-off-by Ran Wang <[email protected]>--- drivers/usb/host/fsl-mph-dr-of.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/usb/host/fsl-mph-dr-of.c +6
-3@@ -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));Quoted 4 lines
if (retval)
--
2.7.4Reviewed-by Peter Chen <[email protected]>One more place need to fix, if
platform_device_allocreturns NULL, it should not callplatform_device_putto release platform device memory.
Quoted 9 lines
pdev = platform_device_alloc(name, id);
if (!pdev) {
retval = -ENOMEM;
goto error;
}
...
error:
platform_device_put(pdev);
return ERR_PTR(retval);Got it, let me check this later.
Thanks & Regards,
Ran