diff options
| -rw-r--r-- | DirectVolume.cpp | 4 | ||||
| -rw-r--r-- | Volume.cpp | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/DirectVolume.cpp b/DirectVolume.cpp index 0960724..3191cc7 100644 --- a/DirectVolume.cpp +++ b/DirectVolume.cpp @@ -197,8 +197,8 @@ void DirectVolume::handlePartitionAdded(const char *devpath, NetlinkEvent *evt) #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; } @@ -218,6 +218,7 @@ int Volume::formatVol() { 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 @@ int Volume::formatVol() { 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) { |