[PATCH 3.2 015/131] usbcore: don't log on consecutive debounce failures of the same port
From: Ben Hutchings <hidden>
Date: 2014-09-11 12:41:11
Also in:
lkml
3.2.63-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Oliver Neukum <redacted> 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 <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [bwh: Backported to 3.2: - Adjust context - Error message already includes the port number] Signed-off-by: Ben Hutchings <redacted> --- drivers/usb/core/hub.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c@@ -3354,6 +3354,7 @@ static void hub_port_connect_change(stru 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(stru 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; }