Do not blindly restore lock state, but depend on the current state (#109

)

The scheduler state checking has been removed as the scheduler being locked out
could still be valid due to the nesting.

CMSIS/RTOS2/FreeRTOS/Source/cmsis_os2.c

@@ -395,6 +395,18 @@ int32_t osKernelRestoreLock (int32_t lock) {
   else {
     switch (xTaskGetSchedulerState()) {
       case taskSCHEDULER_SUSPENDED:
+        if (lock == 0) {
+          if (xTaskResumeAll() != pdTRUE) {
+            lock = (int32_t)osError;
+          }
+        }
+        else {
+          if (lock != 1) {
+            lock = (int32_t)osError;
+          }
+        }
+        break;
+
       case taskSCHEDULER_RUNNING:
         if (lock == 1) {
           vTaskSuspendAll();
@@ -403,13 +415,6 @@ int32_t osKernelRestoreLock (int32_t lock) {
           if (lock != 0) {
             lock = (int32_t)osError;
           }
-          else {
-            if (xTaskResumeAll() != pdTRUE) {
-              if (xTaskGetSchedulerState() != taskSCHEDULER_RUNNING) {
-                lock = (int32_t)osError;
-              }
-            }
-          }
         }
         break;