summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorAlexey Brodkin <Alexey.Brodkin@synopsys.com>2016-07-01 22:47:36 +0300
committerAnatolij Gustschin <agust@denx.de>2016-07-25 22:42:10 +0200
commitd7b60fbfa63431eedccac17674311f0055f323fe (patch)
treea97246d0ba62426d4f7648423b3c6bebcc1a7269 /common
parentadde435fa7c03c17c40e9f771eceed127fbbc251 (diff)
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>
Diffstat (limited to 'common')
-rw-r--r--common/splash_source.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/common/splash_source.c b/common/splash_source.c
index 914f12f4cb5..230b2db4d5b 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)