summaryrefslogtreecommitdiff
path: root/wilink_6_1/utils
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2009-05-22 10:32:21 -0700
committerDmitry Shmidt <dimitrysh@google.com>2009-05-22 10:32:21 -0700
commit12d754a18612383f03b960dfad4dbcaba72df370 (patch)
tree3410c9777a255d8170624e02e88d88d1c823193a /wilink_6_1/utils
parent0b8a0f0a7ce38b52b1ddc40e24d5f3e1f1003ad5 (diff)
downloadti-12d754a18612383f03b960dfad4dbcaba72df370.tar.gz
Add Wifi control abstraction layer, Fix driver removal crash
Diffstat (limited to 'wilink_6_1/utils')
-rw-r--r--wilink_6_1/utils/timer.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/wilink_6_1/utils/timer.c b/wilink_6_1/utils/timer.c
index dbec730..927c7be 100644
--- a/wilink_6_1/utils/timer.c
+++ b/wilink_6_1/utils/timer.c
@@ -353,18 +353,22 @@ TI_HANDLE tmr_CreateTimer (TI_HANDLE hTimerModule)
*/
TI_STATUS tmr_DestroyTimer (TI_HANDLE hTimerInfo)
{
- TTimerInfo *pTimerInfo = (TTimerInfo *)hTimerInfo; /* The timer handle */
- TTimerModule *pTimerModule = (TTimerModule *)pTimerInfo->hTimerModule; /* The timer module handle */
+ TTimerInfo *pTimerInfo = (TTimerInfo *)hTimerInfo; /* The timer handle */
+ TTimerModule *pTimerModule;
- /* Free the OS-API timer */
- os_timerDestroy (pTimerModule->hOs, pTimerInfo->hOsTimerObj);
+ if (!hTimerInfo)
+ return TI_NOK;
+ pTimerModule = (TTimerModule *)pTimerInfo->hTimerModule; /* The timer module handle */
- /* Free the timer object */
- os_memoryFree (pTimerModule->hOs, hTimerInfo, sizeof(TTimerInfo));
-
- pTimerModule->uTimersCount--; /* update created timers number */
+ /* Free the OS-API timer */
+ os_timerDestroy (pTimerModule->hOs, pTimerInfo->hOsTimerObj);
- return TI_OK;
+ /* Free the timer object */
+ os_memoryFree (pTimerModule->hOs, hTimerInfo, sizeof(TTimerInfo));
+
+ pTimerModule->uTimersCount--; /* update created timers number */
+
+ return TI_OK;
}