From 43c2647be76314d6016c4da9e68dfd6fc9dd4197 Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Tue, 26 Feb 2019 12:35:37 +0000 Subject: [PATCH] fix: Fixing rebased created bugs --- platform/mbed_watchdog_mgr.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/platform/mbed_watchdog_mgr.cpp b/platform/mbed_watchdog_mgr.cpp index 0bf4846d5c..2a5de74262 100644 --- a/platform/mbed_watchdog_mgr.cpp +++ b/platform/mbed_watchdog_mgr.cpp @@ -63,7 +63,6 @@ uint32_t mbed_wdog_manager_get_max_timeout() bool mbed_wdog_manager_start() { watchdog_status_t sts; - bool msts = true; MBED_ASSERT(HW_WATCHDOG_TIMEOUT < mbed_wdog_manager_get_max_timeout()); core_util_critical_section_enter(); if (is_watchdog_started) { @@ -73,15 +72,15 @@ bool mbed_wdog_manager_start() watchdog_config_t config; config.timeout_ms = HW_WATCHDOG_TIMEOUT; sts = hal_watchdog_init(&config); - if (sts != WATCHDOG_STATUS_OK) { - msts = false; - } else { - us_timestamp_t timeout = (MS_TO_US(((elapsed_ms <= 0) ? 1 : elapsed_ms))); - get_ticker()->attach_us(callback(&mbed_wdog_manager_kick), timeout); + if (sts == WATCHDOG_STATUS_OK) { is_watchdog_started = true; } core_util_critical_section_exit(); - return msts; + if (is_watchdog_started){ + us_timestamp_t timeout = (MS_TO_US(((elapsed_ms <= 0) ? 1 : elapsed_ms))); + get_ticker()->attach_us(callback(&mbed_wdog_manager_kick), timeout); + } + return is_watchdog_started; } bool mbed_wdog_manager_stop()