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

fs_mgr/fs_mgr.c

diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c
index 2bcc9c4..e51c9cf 100644
--- a/fs_mgr/fs_mgr.c
+++ b/fs_mgr/fs_mgr.c
@@ -523,11 +523,11 @@
         /* We found our match */
         /* First check the filesystem if requested */
         if (fstab[i].fs_mgr_flags & MF_WAIT) {
-            wait_for_file(fstab[i].blk_dev, WAIT_TIMEOUT);
+            wait_for_file(n_blk_dev, WAIT_TIMEOUT);
         }
 
         if (fstab[i].fs_mgr_flags & MF_CHECK) {
-            check_fs(fstab[i].blk_dev, fstab[i].type, fstab[i].mnt_point);
+            check_fs(n_blk_dev, fstab[i].type, fstab[i].mnt_point);
         }
 
         /* Now mount it where requested */