diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-27 22:22:21 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-27 22:22:21 +0300 |
| commit | c6f086ddcbfb47918b82f6a135c61f432540da42 (patch) | |
| tree | 0482b02162e5dbc71e5c43ebda54ff3c4adec7ca /common/splash_source.c | |
| parent | 0b6699ad8ea95803d7ce40d1dc1caea902a6d22c (diff) | |
| parent | b6de2cd7ee5af536ae67ab5522b69e5c4925f5f2 (diff) | |
| download | u-boot-c6f086ddcbfb47918b82f6a135c61f432540da42.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'common/splash_source.c')
| -rw-r--r-- | common/splash_source.c | 6 |
1 files changed, 5 insertions, 1 deletions
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) |