From: Oliver Neukum Date: Mon, 14 Jul 2014 13:39:49 +0000 (+0200) Subject: usbcore: don't log on consecutive debounce failures of the same port X-Git-Tag: v3.2.63~116 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b627762dee539bbd63b6d1be8f0242741325a27;p=thirdparty%2Fkernel%2Fstable.git usbcore: don't log on consecutive debounce failures of the same port commit 5ee0f803cc3a0738a63288e4a2f453c85889fbda upstream. Some laptops have an internal port for a BT device which picks up noise when the kill switch is used, but not enough to trigger printk_rlimit(). So we shouldn't log consecutive faults of this kind. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman [bwh: Backported to 3.2: - Adjust context - Error message already includes the port number] Signed-off-by: Ben Hutchings --- diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 38072947154fd..4dc5266b884d6 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -3354,6 +3354,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, le16_to_cpu(hub->descriptor->wHubCharacteristics); struct usb_device *udev; int status, i; + static int unreliable_port = -1; dev_dbg (hub_dev, "port %d, status %04x, change %04x, %s\n", @@ -3415,10 +3416,11 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, USB_PORT_STAT_C_ENABLE)) { status = hub_port_debounce(hub, port1); if (status < 0) { - if (printk_ratelimit()) + if (port1 != unreliable_port && printk_ratelimit()) dev_err(hub_dev, "connect-debounce failed, " "port %d disabled\n", port1); portstatus &= ~USB_PORT_STAT_CONNECTION; + unreliable_port = port1; } else { portstatus = status; }