commit e9f7b4f22fb979a9486d6728be5469a2712dc105
author Tatenda Chipeperekwa <tatendac@codeaurora.org> Wed Aug 05 12:58:33 2015 -0700
committer Tatenda Chipeperekwa <tatendac@codeaurora.org> Wed Aug 12 16:49:53 2015 -0700
tree aeb42a8494896a9692ba42a7c0ee868b35c40dc3
parent dd9368cab7c28299144fe4a0de8f2859c6a5ed7e

sdm: Close fds only if they are valid

Close poll and release fence fds only if they are valid.

Change-Id: Ia08c211a1a2e059c8ad60d8242bc6598a127cabf

sdm/libs/core/fb/hw_device.cpp

diff --git a/sdm/libs/core/fb/hw_device.cpp b/sdm/libs/core/fb/hw_device.cpp
index 97aa5c9..348d22f 100644
--- a/sdm/libs/core/fb/hw_device.cpp
+++ b/sdm/libs/core/fb/hw_device.cpp
@@ -444,7 +444,9 @@
   DLOGI_IF(kTagDriverConfig, "retire_fence_fd %d", stack->retire_fence_fd);
   DLOGI_IF(kTagDriverConfig, "*******************************************************************");
 
-  Sys::close_(mdp_commit.release_fence);
+  if (mdp_commit.release_fence >= 0) {
+    Sys::close_(mdp_commit.release_fence);
+  }
 
   if (synchronous_commit_) {
     // A synchronous commit can be requested when changing the display mode so we need to update

sdm/libs/core/fb/hw_primary.cpp

diff --git a/sdm/libs/core/fb/hw_primary.cpp b/sdm/libs/core/fb/hw_primary.cpp
index d5c913d..3c61947 100644
--- a/sdm/libs/core/fb/hw_primary.cpp
+++ b/sdm/libs/core/fb/hw_primary.cpp
@@ -223,7 +223,10 @@
   pthread_join(event_thread_, NULL);
 
   for (int event = 0; event < kNumDisplayEvents; event++) {
-    Sys::close_(poll_fds_[event].fd);
+    int &fd = poll_fds_[event].fd;
+    if (fd >= 0) {
+      Sys::close_(fd);
+    }
   }
 
   return HWDevice::Deinit();