commit ba2988015fd34b3f51c7a11bc65ef4548045f9ad
author Robert Greenwalt <robdroid@android.com> Tue Aug 25 15:54:45 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 25 15:54:45 2009 -0700
tree 12fa2ce97ed10198f5a79e84189e105bb6245ef8
parent 87d8ccb07ed0aa4ee55dd473c36191892cbcdd6e
parent e2e89382d675dee0b3dc2db981064c3d14fa8ac7

am e2e89382: Merge change 22636 into eclair

Merge commit 'e2e89382d675dee0b3dc2db981064c3d14fa8ac7' into eclair-plus-aosp

* commit 'e2e89382d675dee0b3dc2db981064c3d14fa8ac7':
  Allow radio to modify net.ppp* properties for dns

vold/blkdev.c

diff --git a/vold/blkdev.c b/vold/blkdev.c
index e10eafc..2c5681a 100644
--- a/vold/blkdev.c
+++ b/vold/blkdev.c
@@ -112,7 +112,7 @@
             goto out;
         }
 
-        for (i = 0; i < 4; i++) {
+        for (i = 0; i < NDOSPART; i++) {
             struct dos_partition part;
 
             dos_partition_dec(block + DOSPARTOFF + i * sizeof(struct dos_partition), &part);
@@ -134,7 +134,7 @@
         struct dos_partition part;
         int part_no = blk->minor -1;
 
-        if (part_no < 4) {
+        if (part_no < NDOSPART) {
             dos_partition_dec(block + DOSPARTOFF + part_no * sizeof(struct dos_partition), &part);
             blk->part_type = part.dp_typ;
         } else {

vold/mmc.c

diff --git a/vold/mmc.c b/vold/mmc.c
index b321c80..22894a1 100644
--- a/vold/mmc.c
+++ b/vold/mmc.c
@@ -25,6 +25,7 @@
 #include "vold.h"
 #include "mmc.h"
 #include "media.h"
+#include "diskmbr.h" /* for NDOSPART */
 
 #define DEBUG_BOOTSTRAP 0
 
@@ -233,7 +234,7 @@
          *mmcblk_devname != '/'; mmcblk_devname--);
     mmcblk_devname++;
 
-    for (part_no = 0; part_no < 4; part_no++) {
+    for (part_no = 1; part_no <= NDOSPART; part_no++) {
         char part_file[255];
         sprintf(part_file, "/sys%s/%sp%d", devpath, mmcblk_devname, part_no);
         if (!access(part_file, F_OK)) {