diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-09-05 05:02:08 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2008-09-05 05:02:08 +0300 |
| commit | b9ef0ed7d7b96eca6394cd0d367369ec511d1bcd (patch) | |
| tree | 6f57b6df619834aff6fea9f6f3e26866a5071eab | |
| parent | fca7a4e9a5c73e1c129e94eeccf8fc795f729931 (diff) | |
i830: Fix timer leak
TimerCancel just cancels the timer: it still leaves the TimerRec intact and
unfreed.
| -rw-r--r-- | src/i830_driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index afce7188..1a50d7bd 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -3528,7 +3528,7 @@ I830LeaveVT(int scrnIndex, int flags) pI830->leaving = TRUE; if (pI830->devicesTimer) - TimerCancel(pI830->devicesTimer); + TimerFree(pI830->devicesTimer); pI830->devicesTimer = NULL; i830SetHotkeyControl(pScrn, HOTKEY_BIOS_SWITCH); @@ -3787,7 +3787,7 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen) } if (pI830->devicesTimer) - TimerCancel(pI830->devicesTimer); + TimerFree(pI830->devicesTimer); pI830->devicesTimer = NULL; if (!pI830->use_drm_mode) { @@ -3936,7 +3936,7 @@ I830PMEvent(int scrnIndex, pmEvent event, Bool undo) /* If we had status checking turned on, turn it off now */ if (pI830->checkDevices) { if (pI830->devicesTimer) - TimerCancel(pI830->devicesTimer); + TimerFree(pI830->devicesTimer); pI830->devicesTimer = NULL; pI830->checkDevices = FALSE; } |