diff options
| author | bernard <[email protected]> | 2014-04-02 13:54:25 +0800 |
|---|---|---|
| committer | bernard <[email protected]> | 2014-04-02 13:54:25 +0800 |
| commit | ed2d2b0d706192083d4248308b59e40859ee03a1 (patch) | |
| tree | 5b656b0a8c0daa6cc1321997185281dd2675c391 /src/thread.c | |
| parent | 17ef8ff63e30a4c1a89cbde3d5535fd223496fea (diff) | |
| parent | 40b7eba4461d1cfb21496e92caae1231321f94be (diff) | |
Merge master branch to stable v1.2.x branch.
Diffstat (limited to 'src/thread.c')
| -rw-r--r-- | src/thread.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/thread.c b/src/thread.c index c2282f6ee6..6c0490a6a3 100644 --- a/src/thread.c +++ b/src/thread.c @@ -575,6 +575,9 @@ rt_err_t rt_thread_suspend(rt_thread_t thread) thread->stat = RT_THREAD_SUSPEND; rt_schedule_remove_thread(thread); + /* stop thread timer anyway */ + rt_timer_stop(&(thread->thread_timer)); + /* enable interrupt */ rt_hw_interrupt_enable(temp); |