commit e7a05200954d8de6d29812320520330b58bfc335
author forfun <forfun414@gmail.com> Tue Dec 20 02:25:07 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 20 02:25:07 2016 +0000
tree b6d79768cf74dedaef46a7c6ebc29d4d160235b7
parent 82044a72b167cb96c51b3a50030d8f6db33af2ad
parent e15cc3979a89cf14cd5ca00ce64096e4ed160e9e

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

Change-Id: I67f296774e14e1e08a3cfbf3370112dc0f957b0c

fs_mgr/fs_mgr.c

diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c
index 7389f59..88b5c98 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;
     }