summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/avb_verify.c1
-rw-r--r--drivers/dfu/dfu_mtd.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/common/avb_verify.c b/common/avb_verify.c
index 76c523fd0ba..cbb2514b1fd 100644
--- a/common/avb_verify.c
+++ b/common/avb_verify.c
@@ -195,6 +195,7 @@ char *avb_set_state(AvbOps *ops, enum avb_boot_state boot_state)
break;
case AVB_ORANGE:
cmdline = "androidboot.verifiedbootstate=orange";
+ break;
case AVB_RED:
break;
}
diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c
index c36ac09189f..da19bc21492 100644
--- a/drivers/dfu/dfu_mtd.c
+++ b/drivers/dfu/dfu_mtd.c
@@ -289,6 +289,9 @@ int dfu_fill_entity_mtd(struct dfu_entity *dfu, char *devstr, char **argv, int a
struct mtd_info *mtd;
int part;
+ /* register partitions with MTDIDS/MTDPARTS or OF fallback */
+ mtd_probe_devices();
+
mtd = get_mtd_device_nm(devstr);
if (IS_ERR_OR_NULL(mtd))
return -ENODEV;
@@ -324,9 +327,6 @@ int dfu_fill_entity_mtd(struct dfu_entity *dfu, char *devstr, char **argv, int a
if (*s)
return -EINVAL;
- /* register partitions with MTDIDS/MTDPARTS or OF fallback */
- mtd_probe_devices();
-
partnum = 0;
list_for_each_entry(partition, &mtd->partitions, node) {
partnum++;