|
@@ -1692,16 +1692,15 @@ static int _deassert_hardreset(struct omap_hwmod *oh, const char *name)
|
|
if (ret == -EBUSY)
|
|
if (ret == -EBUSY)
|
|
pr_warn("omap_hwmod: %s: failed to hardreset\n", oh->name);
|
|
pr_warn("omap_hwmod: %s: failed to hardreset\n", oh->name);
|
|
|
|
|
|
- if (!ret) {
|
|
|
|
|
|
+ if (oh->clkdm) {
|
|
/*
|
|
/*
|
|
* Set the clockdomain to HW_AUTO, assuming that the
|
|
* Set the clockdomain to HW_AUTO, assuming that the
|
|
* previous state was HW_AUTO.
|
|
* previous state was HW_AUTO.
|
|
*/
|
|
*/
|
|
- if (oh->clkdm && hwsup)
|
|
|
|
|
|
+ if (hwsup)
|
|
clkdm_allow_idle(oh->clkdm);
|
|
clkdm_allow_idle(oh->clkdm);
|
|
- } else {
|
|
|
|
- if (oh->clkdm)
|
|
|
|
- clkdm_hwmod_disable(oh->clkdm, oh);
|
|
|
|
|
|
+
|
|
|
|
+ clkdm_hwmod_disable(oh->clkdm, oh);
|
|
}
|
|
}
|
|
|
|
|
|
return ret;
|
|
return ret;
|