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

Commit 09721ba6 authored by Alexandre Bailon's avatar Alexandre Bailon Committed by Greg Kroah-Hartman
Browse files

usb: musb: da8xx: Call earlier clk_prepare_enable() 



The first attempt to read a register may fail because the clock may not
be enabled, and then the probe of musb driver will fail.
Call clk_prepare_enable() before the first register read.

Signed-off-by: default avatarAlexandre Bailon <abailon@baylibre.com>
Signed-off-by: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 35bd67b2

drivers/usb/musb/da8xx.c

+8 −9
Original line number Diff line number Diff line
@@ -369,6 +369,12 @@ static int da8xx_musb_init(struct musb *musb) 


	musb->mregs += DA8XX_MENTOR_CORE_OFFSET;



	ret = clk_prepare_enable(glue->clk);

	if (ret) {

		dev_err(glue->dev, "failed to enable clock\n");

		return ret;

	}



	/* Returns zero if e.g. not clocked */

	rev = musb_readl(reg_base, DA8XX_USB_REVISION_REG);

	if (!rev)
@@ -380,12 +386,6 @@ static int da8xx_musb_init(struct musb *musb) 
		goto fail;

	}



	ret = clk_prepare_enable(glue->clk);

	if (ret) {

		dev_err(glue->dev, "failed to enable clock\n");

		goto fail;

	}



	setup_timer(&otg_workaround, otg_timer, (unsigned long)musb);



	/* Reset the controller */
@@ -395,7 +395,7 @@ static int da8xx_musb_init(struct musb *musb) 
	ret = phy_init(glue->phy);

	if (ret) {

		dev_err(glue->dev, "Failed to init phy.\n");

		goto err_phy_init;

		goto fail;

	}



	ret = phy_power_on(glue->phy);
@@ -415,9 +415,8 @@ static int da8xx_musb_init(struct musb *musb) 


err_phy_power_on:

	phy_exit(glue->phy);

err_phy_init:

	clk_disable_unprepare(glue->clk);

fail:

	clk_disable_unprepare(glue->clk);

	return ret;

}