commit e3f5edf65916a881b71eea54f475c7a4bae8565c
author Tom Rini <trini@konsulko.com> Mon Sep 20 08:45:26 2021 -0400
committer Tom Rini <trini@konsulko.com> Mon Sep 20 08:45:26 2021 -0400
tree 2e0ebe40489de73984f87ec3429ff7482b0b0ea6
parent 3f571228a5340e84123ea7330e2c9cdaea99e733
parent b31077feca2276f0860706d1843f548baae68aee

Merge https://source.denx.de/u-boot/custodians/u-boot-marvell

- wdt: dw: Fix passing NULL pointer to reset functions (Sean)

drivers/watchdog/designware_wdt.c

diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
index afed81e..cfec29b 100644
--- a/drivers/watchdog/designware_wdt.c
+++ b/drivers/watchdog/designware_wdt.c
@@ -22,7 +22,7 @@
 struct designware_wdt_priv {
 	void __iomem	*base;
 	unsigned int	clk_khz;
-	struct reset_ctl_bulk *resets;
+	struct reset_ctl_bulk resets;
 };
 
 /*
@@ -99,11 +99,11 @@
         if (CONFIG_IS_ENABLED(DM_RESET)) {
 		int ret;
 
-		ret = reset_assert_bulk(priv->resets);
+		ret = reset_assert_bulk(&priv->resets);
 		if (ret)
 			return ret;
 
-		ret = reset_deassert_bulk(priv->resets);
+		ret = reset_deassert_bulk(&priv->resets);
 		if (ret)
 			return ret;
 	}
@@ -156,11 +156,11 @@
 #endif
 
 	if (CONFIG_IS_ENABLED(DM_RESET)) {
-		ret = reset_get_bulk(dev, priv->resets);
+		ret = reset_get_bulk(dev, &priv->resets);
 		if (ret)
 			goto err;
 
-		ret = reset_deassert_bulk(priv->resets);
+		ret = reset_deassert_bulk(&priv->resets);
 		if (ret)
 			goto err;
 	}