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

Commit 51a95e4d authored by Evgeny Novikov's avatar Evgeny Novikov Committed by Greg Kroah-Hartman
Browse files

usb: ehci-orion: Handle errors of clk_prepare_enable() in probe 



[ Upstream commit 4720f1bf4ee4a784d9ece05420ba33c9222a3004 ]

ehci_orion_drv_probe() did not account for possible errors of
clk_prepare_enable() that in particular could cause invocation of
clk_disable_unprepare() on clocks that were not prepared/enabled yet,
e.g. in remove or on handling errors of usb_add_hcd() in probe. Though,
there were several patches fixing different issues with clocks in this
driver, they did not solve this problem.

Add handling of errors of clk_prepare_enable() in ehci_orion_drv_probe()
to avoid calls of clk_disable_unprepare() without previous successful
invocation of clk_prepare_enable().

Found by Linux Driver Verification project (linuxtesting.org).

Fixes: 8c869eda ("ARM: Orion: EHCI: Add support for enabling clocks")
Co-developed-by: default avatarKirill Shilimanov <kirill.shilimanov@huawei.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarEvgeny Novikov <novikov@ispras.ru>
Signed-off-by: default avatarKirill Shilimanov <kirill.shilimanov@huawei.com>
Link: https://lore.kernel.org/r/20210825170902.11234-1-novikov@ispras.ru


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d009f519

drivers/usb/host/ehci-orion.c

+6 −2
Original line number Diff line number Diff line
@@ -250,8 +250,11 @@ static int ehci_orion_drv_probe(struct platform_device *pdev) 
	 * the clock does not exists.

	 */

	priv->clk = devm_clk_get(&pdev->dev, NULL);

	if (!IS_ERR(priv->clk))

		clk_prepare_enable(priv->clk);

	if (!IS_ERR(priv->clk)) {

		err = clk_prepare_enable(priv->clk);

		if (err)

			goto err_put_hcd;

	}



	priv->phy = devm_phy_optional_get(&pdev->dev, "usb");

	if (IS_ERR(priv->phy)) {
@@ -312,6 +315,7 @@ static int ehci_orion_drv_probe(struct platform_device *pdev) 
err_phy_get:

	if (!IS_ERR(priv->clk))

		clk_disable_unprepare(priv->clk);

err_put_hcd:

	usb_put_hcd(hcd);

err:

	dev_err(&pdev->dev, "init %s fail, %d\n",