usb_init() may be called multiple times for fetching multiple images
from SPL. Skip reinitializing USB if its already been done

Signed-off-by: Faiz Abbas <faiz_ab...@ti.com>
---
 common/spl/spl_usb.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c
index 92ae96f66e..3648de3492 100644
--- a/common/spl/spl_usb.c
+++ b/common/spl/spl_usb.c
@@ -22,11 +22,16 @@ int spl_usb_load(struct spl_image_info *spl_image,
                 struct spl_boot_device *bootdev, int partition,
                 const char *filename)
 {
-       int err;
+       int err = 0;
        struct blk_desc *stor_dev;
+       static bool usb_init_pending = true;
+
+       if (usb_init_pending) {
+               usb_stop();
+               err = usb_init();
+               usb_init_pending = false;
+       }
 
-       usb_stop();
-       err = usb_init();
        if (err) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
                printf("%s: usb init failed: err - %d\n", __func__, err);
-- 
2.17.1

Reply via email to