diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-04-04 15:16:50 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-04-06 00:34:54 +0100 |
| commit | c962bf8b8fa4d9a6400811296fb270f47db68cf4 (patch) | |
| tree | f5e651935cbbf54e6d1488bbe19a6e2a4599a070 /libgralloc/ionalloc.cpp | |
| parent | 7a8a513ac8a2b9a76b36cf1341d45b00d88ed45c (diff) | |
| parent | 6445344dbaf08ec4d8fbf6aeeffdf29faed64e78 (diff) | |
| download | hardware_qcom_display-cm-10.1.tar.gz hardware_qcom_display-cm-10.1.tar.bz2 hardware_qcom_display-cm-10.1.zip | |
Merge remote-tracking branch 'aosp/jb-mr1.1-release' into cm-10.1cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1
Change-Id: I44a10eaa285d0521669781a4fafb7641df209186
Diffstat (limited to 'libgralloc/ionalloc.cpp')
| -rw-r--r-- | libgralloc/ionalloc.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libgralloc/ionalloc.cpp b/libgralloc/ionalloc.cpp index e01e3dfd7..76db49e8c 100644 --- a/libgralloc/ionalloc.cpp +++ b/libgralloc/ionalloc.cpp @@ -34,7 +34,7 @@ #include <fcntl.h> #include <cutils/log.h> #include <errno.h> -#include "gralloc_priv.h" +#include <gralloc_priv.h> #include "ionalloc.h" using gralloc::IonAlloc; @@ -126,8 +126,6 @@ int IonAlloc::alloc_buffer(alloc_data& data) ALOGE("%s: Failed to map the allocated memory: %s", __FUNCTION__, strerror(errno)); ioctl(mIonFd, ION_IOC_FREE, &handle_data); - if(ionSyncFd >= 0) - close(ionSyncFd); ionSyncFd = FD_INIT; return err; } |