This is a note to let you know that I've just added the patch titled
usbcore: don't log on consecutive debounce failures of the same port
to the 3.16-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usbcore-don-t-log-on-consecutive-debounce-failures-of-the-same-port.patch
and it can be found in the queue-3.16 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 5ee0f803cc3a0738a63288e4a2f453c85889fbda Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oneukum@xxxxxxx>
Date: Mon, 14 Jul 2014 15:39:49 +0200
Subject: usbcore: don't log on consecutive debounce failures of the same port
From: Oliver Neukum <oneukum@xxxxxxx>
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 <oneukum@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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
@@ -4550,6 +4550,7 @@ static void hub_port_connect(struct usb_
struct usb_hcd *hcd = bus_to_hcd(hdev->bus);
struct usb_port *port_dev = hub->ports[port1 - 1];
struct usb_device *udev = port_dev->child;
+ static int unreliable_port = -1;
/* Disconnect any existing devices under this port */
if (udev) {
@@ -4570,10 +4571,14 @@ static void hub_port_connect(struct usb_
USB_PORT_STAT_C_ENABLE)) {
status = hub_port_debounce_be_stable(hub, port1);
if (status < 0) {
- if (status != -ENODEV && printk_ratelimit())
- dev_err(&port_dev->dev,
- "connect-debounce failed\n");
+ if (status != -ENODEV &&
+ port1 != unreliable_port &&
+ printk_ratelimit())
+ dev_err(&udev->dev, "connect-debounce failed, port %d disabled\n",
+ port1);
+
portstatus &= ~USB_PORT_STAT_CONNECTION;
+ unreliable_port = port1;
} else {
portstatus = status;
}
Patches currently in stable-queue which might be from oneukum@xxxxxxx are
queue-3.16/usb-devio-fix-issue-with-log-flooding.patch
queue-3.16/usbcore-don-t-log-on-consecutive-debounce-failures-of-the-same-port.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html