]> granicus.if.org Git - esp-idf/commitdiff
pm: fix initialisation only done in dual core mode
authorIvan Grokhotkov <ivan@espressif.com>
Tue, 27 Mar 2018 02:52:03 +0000 (10:52 +0800)
committerIvan Grokhotkov <ivan@espressif.com>
Tue, 27 Mar 2018 03:20:54 +0000 (11:20 +0800)
Introduced in 9377d4ac. Accidentally put the new code block under an

components/esp32/pm_esp32.c

index c866bd1466fad1574140b77f5d43cb67033fe0cd..a59640115587093437f161de8c75d72e8cb09aaa 100644 (file)
@@ -489,14 +489,16 @@ void esp_pm_impl_init()
     ESP_ERROR_CHECK(esp_pm_lock_create(ESP_PM_CPU_FREQ_MAX, 0, "rtos1",
             &s_rtos_lock_handle[1]));
     ESP_ERROR_CHECK(esp_pm_lock_acquire(s_rtos_lock_handle[1]));
+#endif // portNUM_PROCESSORS == 2
 
     /* Configure all modes to use the default CPU frequency.
      * This will be modified later by a call to esp_pm_configure.
      */
     rtc_cpu_freq_t default_freq;
-    assert(rtc_clk_cpu_freq_from_mhz(CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ, &default_freq));
+    if (!rtc_clk_cpu_freq_from_mhz(CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ, &default_freq)) {
+        assert(false && "unsupported frequency");
+    }
     for (size_t i = 0; i < PM_MODE_COUNT; ++i) {
         s_cpu_freq_by_mode[i] = default_freq;
     }
-#endif // portNUM_PROCESSORS == 2
 }