summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-10-16 13:01:01 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2013-10-22 15:43:56 +1000
commitb47c02f21660bd99a5af5aa374294a22813d6679 (patch)
treeaf63877c8ea6e33cfac4cde2069d1dbf4f421fb3
parent0033e969f4de84aa08ae321bc268a1461e12824b (diff)
sync: always call BracketValues when recalculating upper/lower brackets
Both ServertimeBracketValues and IdleTimeBracketValues copy the value into there SysCounter privates. Call it for a NULL set as well, so we don't end up with stale pointers and we can remove the block/wakeup handlers. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 2efe49c1029f959fe80879bcf50df42e8b80451d)
-rw-r--r--Xext/sync.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/Xext/sync.c b/Xext/sync.c
index 17826c2f8..fa7a5c9d5 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -1058,9 +1058,8 @@ SyncComputeBracketValues(SyncCounter * pCounter)
}
} /* end for each trigger */
- if (pnewgtval || pnewltval) {
- (*psci->BracketValues) ((pointer) pCounter, pnewltval, pnewgtval);
- }
+ (*psci->BracketValues) ((pointer) pCounter, pnewltval, pnewgtval);
+
}
/*