From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 10 May 2015 12:10:14 +0000 (+0200)
Subject: usb: usb_control_msg() propagate controller error code
X-Git-Tag: v2015.07-rc2~241
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=651d95c8eb987034c95f1966556fbc55727a87b3;p=oweals%2Fu-boot.git

usb: usb_control_msg() propagate controller error code

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

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---

diff --git a/common/usb.c b/common/usb.c
index 1b26bfab36..20c614cbcb 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;