diff options
| author | Keith Packard <keithp@keithp.com> | 2000-09-27 20:47:37 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2000-09-27 20:47:37 +0000 |
| commit | 6171187e92152a443f7d5dd7f0dad866b3e275ea (patch) | |
| tree | fac456544632cc6febb67edf12dc2801d72280ed /hw/kdrive/vesa | |
| parent | 367cab99ece8655bbd8a65096bb68bcfd7ef6fea (diff) | |
kdrive: memory/fd leaks fixed in fbdev/vesa/trident drivers
Diffstat (limited to 'hw/kdrive/vesa')
| -rw-r--r-- | hw/kdrive/vesa/vbe.c | 2 | ||||
| -rw-r--r-- | hw/kdrive/vesa/vesa.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/hw/kdrive/vesa/vbe.c b/hw/kdrive/vesa/vbe.c index fecb05803..fa2fbeaa3 100644 --- a/hw/kdrive/vesa/vbe.c +++ b/hw/kdrive/vesa/vbe.c @@ -188,6 +188,8 @@ VbeCleanup(VbeInfoPtr vi) munmap(vi->magicMem, MAGICMEM_SIZE); munmap(vi->loMem, LOMEM_SIZE); munmap(vi->hiMem, HIMEM_SIZE); + close (vi->devmem); + close (vi->devzero); xfree(vi); } diff --git a/hw/kdrive/vesa/vesa.c b/hw/kdrive/vesa/vesa.c index 4542611c0..fa5bfc62d 100644 --- a/hw/kdrive/vesa/vesa.c +++ b/hw/kdrive/vesa/vesa.c @@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/vesa/vesa.c,v 1.5 2000/09/15 07:25:13 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/kdrive/vesa/vesa.c,v 1.6 2000/09/19 23:50:47 keithp Exp $ */ #include "vesa.h" @@ -795,6 +795,8 @@ vesaScreenFini(KdScreenInfo *screen) if (pscr->fb) VbeUnmapFramebuffer(priv->vi, &pscr->mode->vmib, pscr->fb); + if (pscr->shadow) + KdShadowScreenFini (screen); screen->fb[0].depth = pscr->origDepth; return; } |