diff --git a/src/xvmc/i915_xvmc.c b/src/xvmc/i915_xvmc.c
index 0623c53c..404edc0b 100644
--- a/src/xvmc/i915_xvmc.c
+++ b/src/xvmc/i915_xvmc.c
@@ -1618,8 +1618,6 @@ static void i915_release_resource(Display *display, XvMCContext *context)
     uniDRIDestroyContext(display, screen, pI915XvMC->id);
     XUnlockDisplay(display);
 
-    intelDestroyBatchBuffer();
-
     drmUnmap(xvmc_driver->sarea_address, xvmc_driver->sarea_size);
 
     if (xvmc_driver->fd >= 0)
diff --git a/src/xvmc/intel_batchbuffer.c b/src/xvmc/intel_batchbuffer.c
index 82a7bf2d..a3f82ff1 100644
--- a/src/xvmc/intel_batchbuffer.c
+++ b/src/xvmc/intel_batchbuffer.c
@@ -82,7 +82,7 @@ void intelWaitIrq(int seq)
    }
 }
 
-void intelDestroyBatchBuffer(void)
+static void intelDestroyBatchBuffer(void)
 {
    if (xvmc_driver->alloc.offset) {
        xvmc_driver->alloc.ptr = NULL;
@@ -122,12 +122,11 @@ Bool intelInitBatchBuffer(void)
 
 void intelFiniBatchBuffer(void)
 {
-    intelFlushBatch(TRUE);
-
     if (xvmc_driver->batchbuffer.map) {
         drmUnmap(xvmc_driver->batchbuffer.map, xvmc_driver->batchbuffer.size);
         xvmc_driver->batchbuffer.map = NULL;
     }
+    intelDestroyBatchBuffer();
 }
 
 void intelBatchbufferRequireSpace(unsigned int sz)
diff --git a/src/xvmc/intel_batchbuffer.h b/src/xvmc/intel_batchbuffer.h
index 20e7406b..aec71e4a 100644
--- a/src/xvmc/intel_batchbuffer.h
+++ b/src/xvmc/intel_batchbuffer.h
@@ -37,7 +37,6 @@ extern int VERBOSE;
 extern void intelFlushBatch(Bool);
 extern void intelBatchbufferData(const void *, unsigned, unsigned);
 extern Bool intelInitBatchBuffer(void);
-extern Bool intelFnitBatchBuffer(void);
-extern void intelDestroyBatchBuffer(void);
+extern void intelFiniBatchBuffer(void);
 extern void intelCmdIoctl(char *, unsigned);
 #endif /* _INTEL_BATCHBUFFER_H */