summaryrefslogtreecommitdiff
path: root/gralloc/framebuffer_device.cpp
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2016-01-20 20:08:46 -0800
committerJohn Stultz <john.stultz@linaro.org>2016-02-04 16:55:22 -0800
commit37287450406b59bb306ffba66d39822edeeda6a8 (patch)
treeadf510118c69682a1ac6ae2026492ff6d573e54c /gralloc/framebuffer_device.cpp
parentdbfe6f96a76550989b9490518c3042c5e52fffe0 (diff)
downloadhikey-37287450406b59bb306ffba66d39822edeeda6a8.tar.gz
gralloc: Update gralloc source to e219158a67fbfbedbac9
This patch updates the gralloc source to: Subject: Add support for hikey Sha1: e219158a67fbfbedbac99e15809b948313aeb5fa From Xinliang's tree here: https://github.com/xin3liang/gralloc-mali.git Also inlcudes minor whitespace/style fixes and corrected LOCK_STATE_READ_MASK value, noticed in review on Gerrit. These changes are needed to support the r6p0 version of the binary mali graphics libraries. Change-Id: Ia33671447b36fd83da544af6da8ec6ce48e80b05 Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'gralloc/framebuffer_device.cpp')
-rw-r--r--gralloc/framebuffer_device.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/gralloc/framebuffer_device.cpp b/gralloc/framebuffer_device.cpp
index 48e58f8d..cfc480fa 100644
--- a/gralloc/framebuffer_device.cpp
+++ b/gralloc/framebuffer_device.cpp
@@ -420,7 +420,7 @@ static int fb_close(struct hw_device_t *device)
#if GRALLOC_ARM_UMP_MODULE
ump_close();
#endif
- delete dev;
+ free(dev);
}
return 0;
@@ -468,7 +468,7 @@ int framebuffer_device_open(hw_module_t const *module, const char *name, hw_devi
}
/* initialize our state here */
- framebuffer_device_t *dev = (framebuffer_device_t*)malloc(sizeof(framebuffer_device_t));
+ framebuffer_device_t *dev = (framebuffer_device_t *)malloc(sizeof(framebuffer_device_t));
memset(dev, 0, sizeof(*dev));
/* initialize the procs */