commit e4e1a065d943db4f770d12ca5734b9b9257fe78a
author Colin Cross <ccross@android.com> Sat Dec 01 20:39:21 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sat Dec 01 20:39:21 2012 -0800
tree eb7377e25917d5c740c1c2a254c27b85943daf42
parent 34ee8252caa1ede3b1ba41b49673c90e3a500459
parent 2a2f640886c9d356de1407b0888507823a7663b7

am 2a2f6408: Merge "autosuspend_inited flag set even if initialization fails"

* commit '2a2f640886c9d356de1407b0888507823a7663b7':
  autosuspend_inited flag set even if initialization fails

libsuspend/autosuspend.c

diff --git a/libsuspend/autosuspend.c b/libsuspend/autosuspend.c
index 7d1d973..eb1f66e 100644
--- a/libsuspend/autosuspend.c
+++ b/libsuspend/autosuspend.c
@@ -33,8 +33,6 @@
         return 0;
     }
 
-    autosuspend_inited = true;
-
     autosuspend_ops = autosuspend_earlysuspend_init();
     if (autosuspend_ops) {
         goto out;
@@ -56,6 +54,8 @@
     }
 
 out:
+    autosuspend_inited = true;
+
     ALOGV("autosuspend initialized\n");
     return 0;
 }