Skip to content
Snippets Groups Projects
Commit d7b60fbf authored by Alexey Brodkin's avatar Alexey Brodkin Committed by Anatolij Gustschin
Browse files

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: default avatarAlexey 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: default avatarSimon Glass <sjg@chromium.org>
parent adde435f
No related branches found
No related tags found
No related merge requests found
...@@ -146,7 +146,11 @@ static int splash_init_usb(void) ...@@ -146,7 +146,11 @@ static int splash_init_usb(void)
if (err) if (err)
return 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 #else
static inline int splash_init_usb(void) static inline int splash_init_usb(void)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment