]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'bug/ets_timer_crash' into 'master'
authorJiang Jiang Jian <jack@espressif.com>
Thu, 12 Jan 2017 13:33:28 +0000 (21:33 +0800)
committerJiang Jiang Jian <jack@espressif.com>
Thu, 12 Jan 2017 13:33:28 +0000 (21:33 +0800)
tw9503: fix ets timer crash bug

1. tw9503: call ets_timer_disarm before calling ets_timer_setfn

2. change CHECK_AP_CONN to CHECK_STA_CONN

See merge request !414


Trivial merge