From: Stephen Warren swarren@nvidia.com

Without this, if g_dnl_register() fails, the UMS code continues on blindly and crashes. This fix makes it simply print an error message instead.

Signed-off-by: Stephen Warren swarren@nvidia.com --- common/cmd_usb_mass_storage.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c index d8d9efd4f62b..31b7eb0b57ef 100644 --- a/common/cmd_usb_mass_storage.c +++ b/common/cmd_usb_mass_storage.c @@ -40,7 +40,11 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, return CMD_RET_FAILURE; }

- g_dnl_register("usb_dnl_ums"); + rc = g_dnl_register("usb_dnl_ums"); + if (rc) { + error("g_dnl_register failed"); + return CMD_RET_FAILURE; + }

/* Timeout unit: seconds */ int cable_ready_timeout = UMS_CABLE_READY_TIMEOUT;