From b9ef0ed7d7b96eca6394cd0d367369ec511d1bcd Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Fri, 5 Sep 2008 05:02:08 +0300 Subject: [PATCH] i830: Fix timer leak TimerCancel just cancels the timer: it still leaves the TimerRec intact and unfreed. --- src/i830_driver.c | 6 +++--- 1 file 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; }