diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c
index 6cfee47a346b550e8496685aefbfa0a195cd66b4..03f8be21464716f346438e28899b2c8cbbc49bfa 100644
--- a/common/cmd_usb_mass_storage.c
+++ b/common/cmd_usb_mass_storage.c
@@ -154,6 +154,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
 	}
 exit:
 	g_dnl_unregister();
+	board_usb_cleanup(controller_index, USB_INIT_DEVICE);
 	return CMD_RET_SUCCESS;
 }