commit 5197288177d951ebb730ec4bfedfc41227483558
author forfun <forfun414@gmail.com> Tue Dec 20 02:17:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 20 02:17:06 2016 +0000
tree 7fcb110bd34bb24d0a77457e18e718d37868a43e
parent 530b0c7f9d525a079ada22bccaaa92afb49ab832
parent 71f87969b2bf81b507a4b5c27240b81b666a3482

Merge "modify a minor error in mount_with_alternatives Test: when called with end_idx = null" am: 3080ce2fe4
am: d3435f5d31

Change-Id: If9cd28111e7c8dc2635b27d7bd28fe608eeb78fa

fs_mgr/fs_mgr.c

diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c
index 6e6d69f..ba44a5a 100644
--- a/fs_mgr/fs_mgr.c
+++ b/fs_mgr/fs_mgr.c
@@ -464,7 +464,7 @@
     if (!end_idx || !attempted_idx || start_idx >= fstab->num_entries) {
       errno = EINVAL;
       if (end_idx) *end_idx = start_idx;
-      if (attempted_idx) *end_idx = start_idx;
+      if (attempted_idx) *attempted_idx = start_idx;
       return -1;
     }