[U-Boot] [PATCH v5 02/15] usb: usb_control_msg() propagate controller error code

Hans de Goede hdegoede at redhat.com
Sun May 10 14:10:14 CEST 2015


Propagate the error returned by submit_control_msg() ratehr then always
returning -EIO when the hcd code indicates an error.

Signed-off-by: Hans de Goede <hdegoede at redhat.com>
---
 common/usb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/usb.c b/common/usb.c
index 1b26bfa..20c614c 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -192,6 +192,7 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe,
 			void *data, unsigned short size, int timeout)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(struct devrequest, setup_packet, 1);
+	int err;
 
 	if ((timeout == 0) && (!asynch_allowed)) {
 		/* request for a asynch control pipe is not allowed */
@@ -209,8 +210,9 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe,
 	      request, requesttype, value, index, size);
 	dev->status = USB_ST_NOT_PROC; /*not yet processed */
 
-	if (submit_control_msg(dev, pipe, data, size, setup_packet) < 0)
-		return -EIO;
+	err = submit_control_msg(dev, pipe, data, size, setup_packet);
+	if (err < 0)
+		return err;
 	if (timeout == 0)
 		return (int)size;
 
-- 
2.3.6



More information about the U-Boot mailing list