Commit c1995e5a authored by Tony Lindgren's avatar Tony Lindgren
Browse files

soc: ti: omap-prm: Do not check rstst bit on deassert if already deasserted



If a rstctrl reset bit is already deasserted, we can just bail out early
not wait for rstst to clear. Otherwise we can have deassert fail for
already deasserted resets.

Fixes: c5117a78 ("soc: ti: omap-prm: poll for reset complete during de-assert")
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e7ae08d3
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -484,6 +484,10 @@ static int omap_reset_deassert(struct reset_controller_dev *rcdev,
	struct ti_prm_platform_data *pdata = dev_get_platdata(reset->dev);
	int ret = 0;

	/* Nothing to do if the reset is already deasserted */
	if (!omap_reset_status(rcdev, id))
		return 0;

	has_rstst = reset->prm->data->rstst ||
		(reset->prm->data->flags & OMAP_PRM_HAS_RSTST);