commit cc21d6ea5881a9f576296317bde8d818b3e4fc01
author Blair Prescott <blairp@broadcom.com> Mon Oct 21 15:25:37 2013 -0700
committer Jeff Sharkey <jsharkey@android.com> Fri Oct 25 13:06:25 2013 -0700
tree 6a7a0da4b14638922280ab1c925281ce2242817e
parent bcdbd9ac0657a27ff9f7772e74c45ec1e2d460c7

Use correct minor device number to format SD card

When formatting SD card partitions, instead of assuming partition
minor device numbers start from 1, use (minor device number of
the disk device + 1) as the starting point.

Bug: 11352632
Change-Id: I69d37f57aec6b62fe2a055470f7525ec09dc3859
Signed-off-by: Blair Prescott <blairp@broadcom.com>
Signed-off-by: Pierre <pierre@broadcom.com>

Volume.cpp

diff --git a/Volume.cpp b/Volume.cpp
index 21b66b1..9bf86bb 100644
--- a/Volume.cpp
+++ b/Volume.cpp
@@ -250,7 +250,9 @@
     bool formatEntireDevice = (mPartIdx == -1);
     char devicePath[255];
     dev_t diskNode = getDiskDevice();
-    dev_t partNode = MKDEV(MAJOR(diskNode), (formatEntireDevice ? 1 : mPartIdx));
+    dev_t partNode =
+        MKDEV(MAJOR(diskNode),
+              MINOR(diskNode) + (formatEntireDevice ? 1 : mPartIdx));
 
     setState(Volume::State_Formatting);