[PATCH] power-domain: Fix use of uninitialized value in dev_power_domain_ctrl

Sean Anderson seanga2 at gmail.com
Wed Mar 23 19:26:09 CET 2022


If dev_count_phandle_with_args returns 0 or another error, then pd will never
have been initialized by power_domain_get_by_index. Avoid comparing against
pd.dev in this situation.

Fixes: 3e4fcfa4bc ("power-domain: fix hang in endless loop on i.MX8")
Signed-off-by: Sean Anderson <seanga2 at gmail.com>
---

 drivers/power/domain/power-domain-uclass.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/power/domain/power-domain-uclass.c b/drivers/power/domain/power-domain-uclass.c
index 33f9206bd0..1a317a00aa 100644
--- a/drivers/power/domain/power-domain-uclass.c
+++ b/drivers/power/domain/power-domain-uclass.c
@@ -137,7 +137,7 @@ static int dev_power_domain_ctrl(struct udevice *dev, bool on)
 	 * off their power-domain parent. So we will get here again and
 	 * again and will be stuck in an endless loop.
 	 */
-	if (!on && dev_get_parent(dev) == pd.dev &&
+	if (count > 0 && !on && dev_get_parent(dev) == pd.dev &&
 	    device_get_uclass_id(dev) == UCLASS_POWER_DOMAIN)
 		return ret;
 
-- 
2.35.1



More information about the U-Boot mailing list