diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-20 15:45:26 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-20 15:45:26 +0300 |
| commit | e3f5edf65916a881b71eea54f475c7a4bae8565c (patch) | |
| tree | 2e0ebe40489de73984f87ec3429ff7482b0b0ea6 | |
| parent | 3f571228a5340e84123ea7330e2c9cdaea99e733 (diff) | |
| parent | b31077feca2276f0860706d1843f548baae68aee (diff) | |
| download | u-boot-e3f5edf65916a881b71eea54f475c7a4bae8565c.tar.xz | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- wdt: dw: Fix passing NULL pointer to reset functions (Sean)
| -rw-r--r-- | drivers/watchdog/designware_wdt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index afed81e6c6..cfec29bd15 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 @@ static int designware_wdt_stop(struct udevice *dev) 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 @@ static int designware_wdt_probe(struct udevice *dev) #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; } |