summaryrefslogtreecommitdiffstats
path: root/modules/gralloc
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-06-12 15:18:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-12 15:18:23 -0700
commit186f8c526845a23a763f0eb827d1a3b8fccd6e60 (patch)
treea4fa996c927957187c1004be39bf4cdadf6ffa47 /modules/gralloc
parent7b946d786002cb7d171cbc7dfc9f4bda37bb8790 (diff)
parent8405fe5a5203af18f39fd47b35606f0b32cd956c (diff)
downloadhardware_libhardware-186f8c526845a23a763f0eb827d1a3b8fccd6e60.zip
hardware_libhardware-186f8c526845a23a763f0eb827d1a3b8fccd6e60.tar.gz
hardware_libhardware-186f8c526845a23a763f0eb827d1a3b8fccd6e60.tar.bz2
am 8405fe5a: am 1fbbb08d: Merge "remove seemed useless gralloc_open() call in fb_device_open()"
* commit '8405fe5a5203af18f39fd47b35606f0b32cd956c': remove seemed useless gralloc_open() call in fb_device_open()
Diffstat (limited to 'modules/gralloc')
-rw-r--r--modules/gralloc/framebuffer.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/modules/gralloc/framebuffer.cpp b/modules/gralloc/framebuffer.cpp
index a37e2c0..326f2ae 100644
--- a/modules/gralloc/framebuffer.cpp
+++ b/modules/gralloc/framebuffer.cpp
@@ -312,11 +312,6 @@ int fb_device_open(hw_module_t const* module, const char* name,
{
int status = -EINVAL;
if (!strcmp(name, GRALLOC_HARDWARE_FB0)) {
- alloc_device_t* gralloc_device;
- status = gralloc_open(module, &gralloc_device);
- if (status < 0)
- return status;
-
/* initialize our state here */
fb_context_t *dev = (fb_context_t*)malloc(sizeof(*dev));
memset(dev, 0, sizeof(*dev));