diff options
Diffstat (limited to 'cpukit/rtems/src/timercancel.c')
-rw-r--r-- | cpukit/rtems/src/timercancel.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/cpukit/rtems/src/timercancel.c b/cpukit/rtems/src/timercancel.c index fd8d1bee32..e369f0766d 100644 --- a/cpukit/rtems/src/timercancel.c +++ b/cpukit/rtems/src/timercancel.c @@ -48,20 +48,19 @@ rtems_status_code rtems_timer_cancel( the_timer = _Timer_Get( id, &location ); switch ( location ) { -#if defined(RTEMS_MULTIPROCESSING) - case OBJECTS_REMOTE: /* should never return this */ - return RTEMS_INTERNAL_ERROR; -#endif - - case OBJECTS_ERROR: - return RTEMS_INVALID_ID; case OBJECTS_LOCAL: if ( !_Timer_Is_dormant_class( the_timer->the_class ) ) (void) _Watchdog_Remove( &the_timer->Ticker ); _Thread_Enable_dispatch(); return RTEMS_SUCCESSFUL; + +#if defined(RTEMS_MULTIPROCESSING) + case OBJECTS_REMOTE: /* should never return this */ +#endif + case OBJECTS_ERROR: + break; } - return RTEMS_INTERNAL_ERROR; /* unreached - only to remove warnings */ + return RTEMS_INVALID_ID; } |