From dbdc2744ee69ae9eb02bebac87e66c8f2f3ad795 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 30 Aug 2016 15:32:17 +0200 Subject: [PATCH 1/2] cmd: dfu: Add error handling for board_usb_init board_usb_init() can failed and error should be handled properly. Signed-off-by: Michal Simek --- common/dfu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/dfu.c b/common/dfu.c index 4c529f7..0e9f5f5 100644 --- a/common/dfu.c +++ b/common/dfu.c @@ -24,7 +24,11 @@ int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget) bool dfu_reset = false; int ret, i = 0; - board_usb_init(usbctrl_index, USB_INIT_DEVICE); + ret = board_usb_init(usbctrl_index, USB_INIT_DEVICE); + if (ret) { + error("board usb init failed\n"); + return CMD_RET_FAILURE; + } g_dnl_clear_detach(); ret = g_dnl_register(usb_dnl_gadget); if (ret) { From dd93a8e9e688f4c448092a275bf7db3e16d21c6f Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Fri, 28 Oct 2016 09:44:26 +0200 Subject: [PATCH 2/2] dfu: align array in dfu_get_dev_type with enum dfu_device_type Signed-off-by: Patrick Delaunay --- drivers/dfu/dfu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index 20dfcbb..8dacc1a 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -482,7 +482,7 @@ int dfu_config_entities(char *env, char *interface, char *devstr) const char *dfu_get_dev_type(enum dfu_device_type t) { - const char *dev_t[] = {NULL, "eMMC", "OneNAND", "NAND", "RAM" }; + const char *dev_t[] = {NULL, "eMMC", "OneNAND", "NAND", "RAM", "SF" }; return dev_t[t]; }