commit 376448c03249ff6c9f584b80c886fc616b95339a
author Colin Cross <ccross@android.com> Sat Dec 01 20:41:06 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sat Dec 01 20:41:06 2012 -0800
tree cda9dcb8905071e08da29f3bf9d1714c2b12e4c5
parent eb35fdff9260419defa2cfdfa54dde0ebd911854
parent e4e1a065d943db4f770d12ca5734b9b9257fe78a

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

* commit 'e4e1a065d943db4f770d12ca5734b9b9257fe78a':
  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;
 }