mirror of
https://github.com/nxp-imx/linux-imx.git
synced 2025-07-14 21:29:37 +02:00
usb: musb: da8xx: fix a resource leak in probe()
commitde644a4a86
upstream. Call usb_phy_generic_unregister() if of_platform_populate() fails. Fixes:d6299b6efb
("usb: musb: Add support of CPPI 4.1 DMA controller to DA8xx") Cc: stable <stable@kernel.org> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://lore.kernel.org/r/69af1b1d-d3f4-492b-bcea-359ca5949f30@moroto.mountain Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
a96915ffc9
commit
bcf78eca09
|
@ -555,7 +555,7 @@ static int da8xx_probe(struct platform_device *pdev)
|
||||||
ret = of_platform_populate(pdev->dev.of_node, NULL,
|
ret = of_platform_populate(pdev->dev.of_node, NULL,
|
||||||
da8xx_auxdata_lookup, &pdev->dev);
|
da8xx_auxdata_lookup, &pdev->dev);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
goto err_unregister_phy;
|
||||||
|
|
||||||
pinfo = da8xx_dev_info;
|
pinfo = da8xx_dev_info;
|
||||||
pinfo.parent = &pdev->dev;
|
pinfo.parent = &pdev->dev;
|
||||||
|
@ -570,9 +570,13 @@ static int da8xx_probe(struct platform_device *pdev)
|
||||||
ret = PTR_ERR_OR_ZERO(glue->musb);
|
ret = PTR_ERR_OR_ZERO(glue->musb);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(&pdev->dev, "failed to register musb device: %d\n", ret);
|
dev_err(&pdev->dev, "failed to register musb device: %d\n", ret);
|
||||||
usb_phy_generic_unregister(glue->usb_phy);
|
goto err_unregister_phy;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
err_unregister_phy:
|
||||||
|
usb_phy_generic_unregister(glue->usb_phy);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user