diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1995-05-24 21:39:42 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1995-05-24 21:39:42 +0000 |
| commit | 88d594a3d52cb5938521619bca0def8e5b040cf0 (patch) | |
| tree | c687a29a2a3d62c87e496c4c4700183f17210a5c /cpukit/rtems/src | |
| parent | Forcing RCS revision to 1.2 I hope (diff) | |
| download | rtems-88d594a3d52cb5938521619bca0def8e5b040cf0.tar.bz2 | |
Fully tested on all in-house targets
Diffstat (limited to 'cpukit/rtems/src')
| -rw-r--r-- | cpukit/rtems/src/rtemstimer.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cpukit/rtems/src/rtemstimer.c b/cpukit/rtems/src/rtemstimer.c index 076091bee4..abab4cc7b4 100644 --- a/cpukit/rtems/src/rtemstimer.c +++ b/cpukit/rtems/src/rtemstimer.c @@ -146,13 +146,10 @@ rtems_status_code rtems_timer_cancel( case OBJECTS_REMOTE: /* should never return this */ return( RTEMS_INTERNAL_ERROR ); case OBJECTS_LOCAL: - if ( !_Timer_Is_dormant_class( the_timer->the_class ) ) { + if ( !_Timer_Is_dormant_class( the_timer->the_class ) ) (void) _Watchdog_Remove( &the_timer->Ticker ); - _Thread_Enable_dispatch(); - return( RTEMS_SUCCESSFUL ); - } _Thread_Enable_dispatch(); - return( RTEMS_INCORRECT_STATE ); + return( RTEMS_SUCCESSFUL ); } return( RTEMS_INTERNAL_ERROR ); /* unreached - only to remove warnings */ |