1 files changed, 38 insertions, 20 deletions

diff --git a/cpukit/rtems/src/clockset.c b/cpukit/rtems/src/clockset.c
index 7a085ada69..852438991b 100644
--- a/cpukit/rtems/src/clockset.c
+++ b/cpukit/rtems/src/clockset.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /**
  * @file
  *
@@ -11,9 +13,26 @@
  *  COPYRIGHT (c) 1989-1999.
  *  On-Line Applications Research Corporation (OAR).
  *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -29,26 +48,25 @@ rtems_status_code rtems_clock_set(
   const rtems_time_of_day *tod
 )
 {
-  Status_Control status;
-
-  if ( !tod )
-    return RTEMS_INVALID_ADDRESS;
+  rtems_status_code status;
+  Status_Control    score_status;
+  struct timespec   tod_as_timespec;
+  ISR_lock_Context  lock_context;
 
-  if ( _TOD_Validate( tod ) ) {
-    struct timespec  tod_as_timespec;
-    ISR_lock_Context lock_context;
+  status = _TOD_Validate( tod, TOD_ENABLE_TICKS_VALIDATION );
 
-    tod_as_timespec.tv_sec = _TOD_To_seconds( tod );
-    tod_as_timespec.tv_nsec = tod->ticks
-      * rtems_configuration_get_nanoseconds_per_tick();
+  if ( status != RTEMS_SUCCESSFUL ) {
+    return status;
+  }
 
-    _TOD_Lock();
-    _TOD_Acquire( &lock_context );
-    status = _TOD_Set( &tod_as_timespec, &lock_context );
-    _TOD_Unlock();
+  tod_as_timespec.tv_sec = _TOD_To_seconds( tod );
+  tod_as_timespec.tv_nsec = tod->ticks
+    * rtems_configuration_get_nanoseconds_per_tick();
 
-    return _Status_Get( status );
-  }
+  _TOD_Lock();
+  _TOD_Acquire( &lock_context );
+  score_status = _TOD_Set( &tod_as_timespec, &lock_context );
+  _TOD_Unlock();
 
-  return RTEMS_INVALID_CLOCK;
+  return _Status_Get( score_status );
 }