From acb430398993f4601d61a9fdc4f652fb3fce3163 Mon Sep 17 00:00:00 2001
From: Paul Bolle <pebolle@tiscali.nl>
Date: Fri, 11 Mar 2011 18:03:52 +0100
Subject: [PATCH] --- yaml --- r: 235407 b: refs/heads/master c:
 752d57a8b7b97423bffa3452638aa0fd3c3bb9d1 h: refs/heads/master i:   235405:
 573b2f62b10e304e1ea9c72bd8dbd19d61827df3   235403:
 d89ab41857dc9599bb431472c1f8888ed8155f0b   235399:
 8049b76222449b3b0a306e42861c35412fd71d4e   235391:
 9f50e03a80051b6a6e37b7b1e76ade220a56663b v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/usb/core/hub.c | 24 +++++++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 6dc314976991..6fd8f1a22a6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dfeefbc93e38c3a9bd6d4e579cc5a76d3f13dc2
+refs/heads/master: 752d57a8b7b97423bffa3452638aa0fd3c3bb9d1
diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c
index 395754edd063..b574f9131b43 100644
--- a/trunk/drivers/usb/core/hub.c
+++ b/trunk/drivers/usb/core/hub.c
@@ -3408,12 +3408,19 @@ static void hub_events(void)
 			}
 			
 			if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
-				dev_err (hub_dev,
-					"over-current change on port %d\n",
-					i);
+				u16 status = 0;
+				u16 unused;
+
+				dev_dbg(hub_dev, "over-current change on port "
+					"%d\n", i);
 				clear_port_feature(hdev, i,
 					USB_PORT_FEAT_C_OVER_CURRENT);
+				msleep(100);	/* Cool down */
 				hub_power_on(hub, true);
+				hub_port_status(hub, i, &status, &unused);
+				if (status & USB_PORT_STAT_OVERCURRENT)
+					dev_err(hub_dev, "over-current "
+						"condition on port %d\n", i);
 			}
 
 			if (portchange & USB_PORT_STAT_C_RESET) {
@@ -3445,10 +3452,17 @@ static void hub_events(void)
 					hub->limited_power = 0;
 			}
 			if (hubchange & HUB_CHANGE_OVERCURRENT) {
-				dev_dbg (hub_dev, "overcurrent change\n");
-				msleep(500);	/* Cool down */
+				u16 status = 0;
+				u16 unused;
+
+				dev_dbg(hub_dev, "over-current change\n");
 				clear_hub_feature(hdev, C_HUB_OVER_CURRENT);
+				msleep(500);	/* Cool down */
                         	hub_power_on(hub, true);
+				hub_hub_status(hub, &status, &unused);
+				if (status & HUB_STATUS_OVERCURRENT)
+					dev_err(hub_dev, "over-current "
+						"condition\n");
 			}
 		}