Merge branch 'master' into master_devel

mataneli94 · web-flow · commit b1d788ab6266 · 2020-03-29T13:34:48.000+03:00
diff --git a/mlxfwops/lib/fsctrl_ops.cpp b/mlxfwops/lib/fsctrl_ops.cpp
@@ -223,7 +223,7 @@ bool FsCtrlOperations::FwReactivateImage()
         case FWCOMPS_IMAGE_REACTIVATION_FW_NOT_SUPPORTED:
             return errmsg(MLXFW_ERR, "Image reactivation - FW doesn't support this operation");
         default:
-            return errmsg(MLXFW_IMAGE_REACTIVATION_UNKNOWN_ERROR, "Unknown error occured");
+            return errmsg(MLXFW_IMAGE_REACTIVATION_UNKNOWN_ERROR, "Unknown error occurred\n");
         }
     }
     return true;
diff --git a/small_utils/mstfwreset.py b/small_utils/mstfwreset.py
@@ -239,7 +239,7 @@ def reset_fsm_register():
 def sigHndl(signal, frame):
     reset_fsm_register()
 
-    print("\nSignal %d received, Exiting..." % signal)
+    print("\nSignal %d received, exiting..." % signal)
     sys.exit(1)
 
 def set_signal_handler():

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ bool FsCtrlOperations::FwReactivateImage()`
`223`	`223`	`case FWCOMPS_IMAGE_REACTIVATION_FW_NOT_SUPPORTED:`
`224`	`224`	`return errmsg(MLXFW_ERR, "Image reactivation - FW doesn't support this operation");`
`225`	`225`	`default:`
`226`		`- return errmsg(MLXFW_IMAGE_REACTIVATION_UNKNOWN_ERROR, "Unknown error occured");`
	`226`	`+ return errmsg(MLXFW_IMAGE_REACTIVATION_UNKNOWN_ERROR, "Unknown error occurred\n");`
`227`	`227`	`}`
`228`	`228`	`}`
`229`	`229`	`return true;`