diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-14 19:30:31 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-14 19:30:31 +0000 |
commit | e135573acc348649e767ca67a1ec189fe4e0fcda (patch) | |
tree | b34f7d2914cba8aeb9311c5bae3771af40054640 /nuttx/sched/timer_delete.c | |
parent | d76fa866ad009d65396acf1aa08fcffd3b4b041e (diff) | |
download | px4-nuttx-e135573acc348649e767ca67a1ec189fe4e0fcda.tar.gz px4-nuttx-e135573acc348649e767ca67a1ec189fe4e0fcda.tar.bz2 px4-nuttx-e135573acc348649e767ca67a1ec189fe4e0fcda.zip |
Fix STM32 F2/F4 SDIO clocking; Clean-up files in sched/ directory
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4940 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/sched/timer_delete.c')
-rw-r--r-- | nuttx/sched/timer_delete.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/nuttx/sched/timer_delete.c b/nuttx/sched/timer_delete.c index e89dd15a1..c497c414e 100644 --- a/nuttx/sched/timer_delete.c +++ b/nuttx/sched/timer_delete.c @@ -2,7 +2,7 @@ * timer_delete.c * * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -67,13 +67,14 @@ ********************************************************************************/ /******************************************************************************** - * Function: timer_delete + * Name: timer_delete * * Description: * The timer_delete() function deletes the specified timer, timerid, previously * created by the timer_create() function. If the timer is armed when * timer_delete() is called, the timer will be automatically disarmed before - * removal. The disposition of pending signals for the deleted timer is unspecified. + * removal. The disposition of pending signals for the deleted timer is + * unspecified. * * Parameters: * timerid - The per-thread timer, previously created by the call to @@ -81,7 +82,8 @@ * * Return Value: * If the call succeeds, timer_create() will return 0 (OK). Otherwise, the - * function will return a value of -1 (ERROR) and set errno to indicate the error. + * function will return a value of -1 (ERROR) and set errno to indicate the + * error. * * EINVAL - The timer specified timerid is not valid. * @@ -94,9 +96,10 @@ int timer_delete(timer_t timerid) int ret = timer_release((FAR struct posix_timer_s *)timerid); if (ret < 0) { - *get_errno_ptr() = -ret; - return ERROR; + set_errno(-ret); + return ERROR; } + return OK; } |