From 122b5c8121378539077429b903f4756fa983168e Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Tue, 22 May 2007 11:48:17 -0400
Subject: [PATCH] --- yaml --- r: 56845 b: refs/heads/master c:
 d4b7d8e8024a33d9d1f916379eaee7aa945a7c48 h: refs/heads/master i:   56843:
 fc99bd4696547ebcb66128076b61f73d57c86e13 v: v3

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

diff --git a/[refs] b/[refs]
index 2043c36da96a..8eaba650e156 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd865571d7af06ba1285c2db85083649193cceab
+refs/heads/master: d4b7d8e8024a33d9d1f916379eaee7aa945a7c48
diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c
index 6a6e4f8c69ba..caaa46f2dec7 100644
--- a/trunk/drivers/usb/core/hub.c
+++ b/trunk/drivers/usb/core/hub.c
@@ -2421,10 +2421,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
 
 	if (portchange & USB_PORT_STAT_C_CONNECTION) {
 		status = hub_port_debounce(hub, port1);
-		if (status < 0 && printk_ratelimit()) {
-			dev_err (hub_dev,
-				"connect-debounce failed, port %d disabled\n",
-				port1);
+		if (status < 0) {
+			if (printk_ratelimit())
+				dev_err (hub_dev, "connect-debounce failed, "
+						"port %d disabled\n", port1);
 			goto done;
 		}
 		portstatus = status;