Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[deliverable/linux.git] / drivers / watchdog / watchdog_core.c

diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c
index e600fd93b7de50f359f68a6007275ef0a6530a09..c1658fe73d58a19a774ebdcb227b13c6b0b5038b 100644 (file)
--- a/drivers/watchdog/watchdog_core.c
+++ b/drivers/watchdog/watchdog_core.c
@@ -164,7 +164,7 @@ static int watchdog_restart_notifier(struct notifier_block *nb,
 
        int ret;
 
-       ret = wdd->ops->restart(wdd);
+       ret = wdd->ops->restart(wdd, action, data);
        if (ret)
                return NOTIFY_BAD;
 
@@ -199,7 +199,7 @@ static int __watchdog_register_device(struct watchdog_device *wdd)
                return -EINVAL;
 
        /* Mandatory operations need to be supported */
-       if (wdd->ops->start == NULL || wdd->ops->stop == NULL)
+       if (!wdd->ops->start || (!wdd->ops->stop && !wdd->max_hw_heartbeat_ms))
                return -EINVAL;
 
        watchdog_check_min_max_timeout(wdd);