commit af5041cca803f4e7f0d2dfeca596abb8bda313b6
author Eino-Ville Talvala <etalvala@google.com> Tue Oct 09 21:57:37 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 09 21:57:38 2012 -0700
tree 0219c3bce8984d3dc2ad402c5e7a48e10cefdf74
parent c6fbe60e4232911bb80a27e1badc670b2b80efbd
parent d230cc783aa13de5c563adec54641bec6a355054

Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev

services/camera/libcameraservice/CameraClient.cpp

diff --git a/services/camera/libcameraservice/CameraClient.cpp b/services/camera/libcameraservice/CameraClient.cpp
index 5b59ef9..7e199fa 100644
--- a/services/camera/libcameraservice/CameraClient.cpp
+++ b/services/camera/libcameraservice/CameraClient.cpp
@@ -73,6 +73,7 @@
     if (res != OK) {
         ALOGE("%s: Camera %d: unable to initialize device: %s (%d)",
                 __FUNCTION__, mCameraId, strerror(-res), res);
+        mHardware.clear();
         return NO_INIT;
     }