summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-11-16 10:28:23 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2011-11-16 22:15:39 +0000
commitc259144e3fc52d078b0a78107c38f0f3d3a2bbc1 (patch)
tree87ef5564e4615eaa696d4b5f4393b1bc52d45b65
parentbfd2bb40274d1242001d295a4010211fd51b0fc3 (diff)
sna: The block handler is passed an indirect pointer to the timeval
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_driver.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 4c9f298b..45e8fb20 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -582,13 +582,14 @@ static void
sna_block_handler(int i, pointer data, pointer timeout, pointer read_mask)
{
struct sna *sna = data;
- struct timeval *tv = timeout;
+ struct timeval **tv = timeout;
- DBG(("%s\n", __FUNCTION__));
+ DBG(("%s (tv=%ld.%06ld)\n", __FUNCTION__,
+ *tv ? (*tv)->tv_sec : -1, *tv ? (*tv)->tv_usec : 0));
sna->BlockHandler(i, sna->BlockData, timeout, read_mask);
- if (tv == NULL || (tv->tv_usec | tv->tv_sec))
+ if (*tv == NULL || ((*tv)->tv_usec | (*tv)->tv_sec))
sna_accel_block_handler(sna);
}