Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-17 22:49:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
- 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
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 {
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;
}