summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/stpmic1_wdt.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-11-07 14:26:42 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2019-11-07 14:26:42 +0100
commitcd8a909bb3e7af6d905e4b554b10a3bf9718f5c5 (patch)
tree9cc4ccf3fcd9c54d6290f56deeeb32ecf4841641 /drivers/watchdog/stpmic1_wdt.c
parent701a6ae36b6c818ff936952576d5e33ed710ddb5 (diff)
parent52cc061f50aa12adcef0a00c9a56eb7c60865a1c (diff)
downloadbarebox-cd8a909bb3e7af6d905e4b554b10a3bf9718f5c5.tar.gz
Merge branch 'for-next/stm32'
Diffstat (limited to 'drivers/watchdog/stpmic1_wdt.c')
-rw-r--r--drivers/watchdog/stpmic1_wdt.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/watchdog/stpmic1_wdt.c b/drivers/watchdog/stpmic1_wdt.c
index eb8c43f..5d9720c 100644
--- a/drivers/watchdog/stpmic1_wdt.c
+++ b/drivers/watchdog/stpmic1_wdt.c
@@ -169,7 +169,10 @@ static int stpmic1_wdt_probe(struct device_d *dev)
int ret;
wdt = xzalloc(sizeof(*wdt));
- wdt->regmap = dev->parent->priv;
+
+ wdt->regmap = dev_get_regmap(dev->parent, NULL);
+ if (IS_ERR(wdt->regmap))
+ return PTR_ERR(wdt->regmap);
wdd = &wdt->wdd;
wdd->hwdev = dev;