LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

- wdt: dw: Fix passing NULL pointer to reset functions (Sean)
This commit is contained in:
Tom Rini 2021-09-20 08:45:26 -04:00
parent 3f571228a5 b31077feca
commit e3f5edf659
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/watchdog/designware_wdt.c
View File

@ -22,7 +22,7 @@
struct designware_wdt_priv { struct designware_wdt_priv {
void __iomem *base; void __iomem *base;
unsigned int clk_khz; 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)) { if (CONFIG_IS_ENABLED(DM_RESET)) {
int ret; int ret;
ret = reset_assert_bulk(priv->resets); ret = reset_assert_bulk(&priv->resets);
if (ret) if (ret)
return ret; return ret;
ret = reset_deassert_bulk(priv->resets); ret = reset_deassert_bulk(&priv->resets);
if (ret) if (ret)
return ret; return ret;
} }
@ -156,11 +156,11 @@ static int designware_wdt_probe(struct udevice *dev)
#endif #endif
if (CONFIG_IS_ENABLED(DM_RESET)) { if (CONFIG_IS_ENABLED(DM_RESET)) {
ret = reset_get_bulk(dev, priv->resets); ret = reset_get_bulk(dev, &priv->resets);
if (ret) if (ret)
goto err; goto err;
ret = reset_deassert_bulk(priv->resets); ret = reset_deassert_bulk(&priv->resets);
if (ret) if (ret)
goto err; goto err;
} }