Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50717d3c authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

merge from open-source master

parents 444acdd4 e36c153e

vold/blkdev.c

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ int blkdev_refresh(blkdev_t *blk) 
            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 @@ int blkdev_refresh(blkdev_t *blk) 
        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

+2 −1
Original line number Diff line number Diff line
@@ -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 @@ static int mmc_bootstrap_mmcblk(char *devpath) 
         *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)) {