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()
This commit is contained in:
Jean-Baptiste Queru 2012-06-12 15:18:23 -07:00 committed by Android Git Automerger
commit 186f8c5268

View file

@ -312,11 +312,6 @@ int fb_device_open(hw_module_t const* module, const char* name,
{ {
int status = -EINVAL; int status = -EINVAL;
if (!strcmp(name, GRALLOC_HARDWARE_FB0)) { 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 */ /* initialize our state here */
fb_context_t *dev = (fb_context_t*)malloc(sizeof(*dev)); fb_context_t *dev = (fb_context_t*)malloc(sizeof(*dev));
memset(dev, 0, sizeof(*dev)); memset(dev, 0, sizeof(*dev));