From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Date: Fri, 1 Jul 2016 19:47:36 +0000 (+0300)
Subject: splash: Accommodate DM_USB in splash_init_usb()
X-Git-Tag: v2016.09-rc2~176^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d7b60fbfa63431eedccac17674311f0055f323fe;p=u-boot

splash: Accommodate DM_USB in splash_init_usb()

Current implementation of splash_init_usb() requires usb_stor_scan()
which doesn't exist in case of DM_USB simply because real probing
happens right in usb_init().

So disable usage of usb_stor_scan() in case of DM_USB.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Simon Glass <sjg@chromium.org>
Cc: Jeroen Hofstee <jeroen@myspectrum.nl>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Robert Winkler <robert.winkler@boundarydevices.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/splash_source.c b/common/splash_source.c
index 914f12f4cb..230b2db4d5 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -146,7 +146,11 @@ static int splash_init_usb(void)
 	if (err)
 		return err;
 
-	return usb_stor_scan(1) < 0 ? -ENODEV : 0;
+#ifndef CONFIG_DM_USB
+	err = usb_stor_scan(1) < 0 ? -ENODEV : 0;
+#endif
+
+	return err;
 }
 #else
 static inline int splash_init_usb(void)