From 97b9eb9e6a2f2cc4c79fe6c0ad7cd3bc7dbe3457 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 1 Aug 2014 03:09:53 +0200 Subject: [PATCH] usb: Handle -ENODEV from usb_lowlevel_init() As we support both Host and Device mode operation, an OTG controller can return -ENODEV on a port which it found to be in Device mode during Host mode scan for devices. In case -ENODEV is returned, print that the port is not available and continue instead of screaming a bloody error message. Signed-off-by: Marek Vasut --- common/usb.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/common/usb.c b/common/usb.c index 60daa10052..bd0f8d5d18 100644 --- a/common/usb.c +++ b/common/usb.c @@ -34,7 +34,7 @@ #include #include #include - +#include #include #ifdef CONFIG_4xx #include @@ -60,6 +60,7 @@ int usb_init(void) void *ctrl; struct usb_device *dev; int i, start_index = 0; + int ret; dev_index = 0; asynch_allowed = 1; @@ -75,7 +76,13 @@ int usb_init(void) for (i = 0; i < CONFIG_USB_MAX_CONTROLLER_COUNT; i++) { /* init low_level USB */ printf("USB%d: ", i); - if (usb_lowlevel_init(i, USB_INIT_HOST, &ctrl)) { + ret = usb_lowlevel_init(i, USB_INIT_HOST, &ctrl); + if (ret == -ENODEV) { /* No such device. */ + puts("Port not available.\n"); + continue; + } + + if (ret) { /* Other error. */ puts("lowlevel init failed\n"); continue; } -- 2.25.1