Mesa (master): i915g: Handle i915->batch == NULL correctly in flush

[Stephane Marchesin]

Module: Mesa
Branch: master
Commit: 519a2cf9507275d4a3e9926072b07a3f98f0095a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=519a2cf9507275d4a3e9926072b07a3f98f0095a

Author: Stéphane Marchesin <marcheu at chromium.org>
Date:   Fri Sep  6 10:55:16 2013 -0700

i915g: Handle i915->batch == NULL correctly in flush

Fixes warning reported by Coverity.

---

 src/gallium/drivers/i915/i915_flush.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_flush.c b/src/gallium/drivers/i915/i915_flush.c
index 0dca722..8cc31a8 100644
--- a/src/gallium/drivers/i915/i915_flush.c
+++ b/src/gallium/drivers/i915/i915_flush.c
@@ -45,10 +45,13 @@ static void i915_flush_pipe( struct pipe_context *pipe,
    struct i915_context *i915 = i915_context(pipe);
    enum i915_winsys_flush_flags winsys_flags = I915_FLUSH_ASYNC;
 
+   if (!i915->batch)
+      return;
+
    /* Only shortcut this if we have no fence, otherwise we must flush the
     * empty batchbuffer to get our fence back.
     */
-   if (!fence && i915->batch && (i915->batch->map == i915->batch->ptr)) {
+   if (!fence && (i915->batch->map == i915->batch->ptr)) {
       return;
    }