Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a93b9734 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

usb: musb: da8xx: fix a resource leak in probe() 



commit de644a4a86be04ed8a43ef8267d0f7d021941c5e upstream.

Call usb_phy_generic_unregister() if of_platform_populate() fails.

Fixes: d6299b6e ("usb: musb: Add support of CPPI 4.1 DMA controller to DA8xx")
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/69af1b1d-d3f4-492b-bcea-359ca5949f30@moroto.mountain


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a0886d04

drivers/usb/musb/da8xx.c

+6 −2
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ static int da8xx_probe(struct platform_device *pdev) 
	ret = of_platform_populate(pdev->dev.of_node, NULL,

				   da8xx_auxdata_lookup, &pdev->dev);

	if (ret)

		return ret;

		goto err_unregister_phy;



	memset(musb_resources, 0x00, sizeof(*musb_resources) *

			ARRAY_SIZE(musb_resources));
@@ -582,9 +582,13 @@ static int da8xx_probe(struct platform_device *pdev) 
	ret = PTR_ERR_OR_ZERO(glue->musb);

	if (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;

}