summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Eisenbach <eisenbach@google.com>2014-07-17 01:59:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-16 23:30:53 +0000
commit0eb7f49738d2d6c12f3db77b74d9e404180e9a3f (patch)
tree8b83e3fda8947190ccde80a2139fc402073ffade
parentdd29f036a8cde94b3c296fb08ee3e9b2d65c15e0 (diff)
parent9640662cde60694c12fe3f9e1b2aa7ee4f27729b (diff)
downloadandroid_system_bt-0eb7f49738d2d6c12f3db77b74d9e404180e9a3f.tar.gz
android_system_bt-0eb7f49738d2d6c12f3db77b74d9e404180e9a3f.tar.bz2
android_system_bt-0eb7f49738d2d6c12f3db77b74d9e404180e9a3f.zip
Merge "Fix GKI_add_to_timer_list to handle middle-of-list insertions correctly" into lmp-dev
-rw-r--r--gki/common/gki_time.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/gki/common/gki_time.c b/gki/common/gki_time.c
index fb60a4efa..2d2d0bca8 100644
--- a/gki/common/gki_time.c
+++ b/gki/common/gki_time.c
@@ -673,6 +673,8 @@ void GKI_add_to_timer_list (TIMER_LIST_Q *p_timer_listq, TIMER_LIST_ENT *p_tle)
}
p_tle->p_prev = i->p_prev;
+ if (p_tle->p_prev)
+ p_tle->p_prev->p_next = p_tle;
p_tle->p_next = i;
i->p_prev = p_tle;
i->ticks -= p_tle->ticks;