commit 1206e872ce74aab253c39c3547bfaadc5e1f6011
author Jean-Baptiste Queru <jbq@google.com> Fri Nov 19 10:20:37 2010 -0800
committer Jean-Baptiste Queru <jbq@google.com> Fri Nov 19 10:20:37 2010 -0800
tree a98aed4569df620e437e4920d246241d3531dac0
parent 92c243afae15567f166d0059db5aff13b8849596
parent 09f774b7d3ad4e4205485b6997d44f7edd084598

resolved conflicts for merge of 09f774b7 to gingerbread-plus-aosp

Change-Id: I103db47198ad09783aa6539cde271df0fdb9c594

DirectVolume.cpp

diff --git a/DirectVolume.cpp b/DirectVolume.cpp
index 0960724..3191cc7 100644
--- a/DirectVolume.cpp
+++ b/DirectVolume.cpp
@@ -197,8 +197,8 @@
 #ifdef PARTITION_DEBUG
     SLOGD("Dv:partAdd: part_num = %d, minor = %d\n", part_num, minor);
 #endif
-    if (part_num >= MAX_PARTITIONS) {
-        SLOGE("Dv:partAdd: ignoring part_num = %d (max: %d)\n", part_num, MAX_PARTITIONS-1);
+    if (part_num > MAX_PARTITIONS) {
+        SLOGE("Dv:partAdd: ignoring part_num = %d (max: %d)\n", part_num, MAX_PARTITIONS);
     } else {
         mPartMinors[part_num -1] = minor;
     }

Volume.cpp

diff --git a/Volume.cpp b/Volume.cpp
index d2b87b6..ecf7dcd 100644
--- a/Volume.cpp
+++ b/Volume.cpp
@@ -218,6 +218,7 @@
 
     setState(Volume::State_Formatting);
 
+    int ret = -1;
     // Only initialize the MBR if we are formatting the entire device
     if (formatEntireDevice) {
         sprintf(devicePath, "/dev/block/vold/%d:%d",
@@ -241,10 +242,11 @@
         goto err;
     }
 
-    setState(Volume::State_Idle);
-    return 0;
+    ret = 0;
+
 err:
-    return -1;
+    setState(Volume::State_Idle);
+    return ret;
 }
 
 bool Volume::isMountpointMounted(const char *path) {