commit 0291262a68a42ac954f433a3f1cbb8e93204f239
author Blair Prescott <blairp@broadcom.com> Fri Oct 25 16:14:00 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 25 16:14:00 2013 -0700
tree 2293d47d7e48a4ed8dcb8ccc74bfc40d48a04f00
parent 18caf5b717191617e8822e0d2a66d5c0cb2adff1
parent 3aefb598e4811acc5a198cc9ba20025d95803353

am 3aefb598: am cc21d6ea: Use correct minor device number to format SD card

* commit '3aefb598e4811acc5a198cc9ba20025d95803353':
  Use correct minor device number to format SD card

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);