commit 25701705efc949e689a6a3c7b3b64a305673917e
author Linux Build Service Account <lnxbuild@localhost> Wed Sep 04 12:59:10 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 04 12:59:10 2013 -0700
tree d8f5dddde8bd1da14277c5fe3bfcdce4f3465c9e
parent 3cc77844f761075b8a22a874d222946c8ba2e19c
parent 69662ac981f9c655b7aefb04f8981e822af1dff4

Merge "gralloc: Move getAllocator in unlock"

libgralloc/mapper.cpp

diff --git a/libgralloc/mapper.cpp b/libgralloc/mapper.cpp
index 10d372a..30754dd 100644
--- a/libgralloc/mapper.cpp
+++ b/libgralloc/mapper.cpp
@@ -247,9 +247,9 @@
         return -EINVAL;
     int err = 0;
     private_handle_t* hnd = (private_handle_t*)handle;
-    IMemAlloc* memalloc = getAllocator(hnd->flags);
 
     if (hnd->flags & private_handle_t::PRIV_FLAGS_USES_ION) {
+        IMemAlloc* memalloc = getAllocator(hnd->flags);
         if (hnd->flags & private_handle_t::PRIV_FLAGS_NEEDS_FLUSH) {
             err = memalloc->clean_buffer((void*)hnd->base,
                                          hnd->size, hnd->offset, hnd->fd,