diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-09-05 05:02:08 +0300 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2008-10-18 12:19:06 +0200 |
| commit | f930266b35faedb08b4d627fa21d88d5e2463f91 (patch) | |
| tree | 9fcca9784b5bb2d1336b781c75ae9d1877ed6bdb | |
| parent | fd3212c44602cb46883e0dc75504d616cd23e18d (diff) | |
| download | xf86-video-intel-frc-f930266b35faedb08b4d627fa21d88d5e2463f91.tar.gz xf86-video-intel-frc-f930266b35faedb08b4d627fa21d88d5e2463f91.tar.bz2 | |
i830: Fix timer leak
TimerCancel just cancels the timer: it still leaves the TimerRec intact and
unfreed.
(cherry picked from commit b9ef0ed7d7b96eca6394cd0d367369ec511d1bcd)
| -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 ca36d180..e65340bf 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -3222,7 +3222,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); @@ -3455,7 +3455,7 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen) } if (pI830->devicesTimer) - TimerCancel(pI830->devicesTimer); + TimerFree(pI830->devicesTimer); pI830->devicesTimer = NULL; DPRINTF(PFX, "\nUnmapping memory\n"); @@ -3591,7 +3591,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; } |