commit 7e88be90cf44838fd183ee3d4981c19d7171e501
author Zach Reizner <zachr@google.com> Mon Oct 12 15:20:33 2015 -0700
committer Zach Reizner <zachr@google.com> Mon Oct 12 19:04:47 2015 -0700
tree 5764fea257b0f45b78693d9230dcb9b712cf108a
parent f99d53f6f9535055710f17ff7573f9b52d54e07f

drm_hwcomposer: improve logging and reliability of some error paths

Change-Id: I4a955c6261a9674009eec2264eb2ef4a161da9c4

drmcomposition.cpp

diff --git a/drmcomposition.cpp b/drmcomposition.cpp
index 55fa00c..4b293ee 100644
--- a/drmcomposition.cpp
+++ b/drmcomposition.cpp
@@ -58,10 +58,9 @@
     // If the display hasn't been modeset yet, this will be NULL
     DrmCrtc *crtc = drm_->GetCrtcForDisplay(display);
 
-    int ret = composition_map_[(*iter)->display()]->Init(drm_, crtc, importer_,
-                                                         frame_no);
+    int ret = composition_map_[display]->Init(drm_, crtc, importer_, frame_no);
     if (ret) {
-      ALOGE("Failed to init display composition for %d", (*iter)->display());
+      ALOGE("Failed to init display composition for %d", display);
       return ret;
     }
   }