From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 10 May 2015 12:10:15 +0000 (+0200)
Subject: usb: legacy_hub_port_reset() check and propagate usb_set_port_feature() errors
X-Git-Tag: v2015.07-rc2~240
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ad84a42fc5143ef66a75550d7465b86cbc787f25;p=u-boot

usb: legacy_hub_port_reset() check and propagate usb_set_port_feature() errors

Actually check for usb_set_port_feature() errors and propagate these if they
happen.

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

diff --git a/common/usb_hub.c b/common/usb_hub.c
index c9be530d0b..7aac220116 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -157,7 +157,7 @@ static inline char *portspeed(int portstatus)
 int legacy_hub_port_reset(struct usb_device *dev, int port,
 			unsigned short *portstat)
 {
-	int tries;
+	int err, tries;
 	ALLOC_CACHE_ALIGN_BUFFER(struct usb_port_status, portsts, 1);
 	unsigned short portstatus, portchange;
 
@@ -168,8 +168,10 @@ int legacy_hub_port_reset(struct usb_device *dev, int port,
 	debug("%s: resetting port %d...\n", __func__, port + 1);
 #endif
 	for (tries = 0; tries < MAX_TRIES; tries++) {
+		err = usb_set_port_feature(dev, port + 1, USB_PORT_FEAT_RESET);
+		if (err < 0)
+			return err;
 
-		usb_set_port_feature(dev, port + 1, USB_PORT_FEAT_RESET);
 		mdelay(200);
 
 		if (usb_get_port_status(dev, port + 1, portsts) < 0) {