leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usbcore: don't log on consecutive debounce failures of the same port

Browse Source 
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@suse.de>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oliver Neukum 2014-07-14 15:39:49 +02:00 committed by Greg Kroah-Hartman
parent 934ef5aca9
commit 5ee0f803cc
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/usb/core/hub.c
View File

@ -4547,6 +4547,7 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
struct usb_hcd *hcd = bus_to_hcd(hdev->bus); struct usb_hcd *hcd = bus_to_hcd(hdev->bus);
struct usb_port *port_dev = hub->ports[port1 - 1]; struct usb_port *port_dev = hub->ports[port1 - 1];
struct usb_device *udev = port_dev->child; struct usb_device *udev = port_dev->child;
static int unreliable_port = -1;
/* Disconnect any existing devices under this port */ /* Disconnect any existing devices under this port */
if (udev) { if (udev) {
@ -4567,10 +4568,14 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
USB_PORT_STAT_C_ENABLE)) { USB_PORT_STAT_C_ENABLE)) {
status = hub_port_debounce_be_stable(hub, port1); status = hub_port_debounce_be_stable(hub, port1);
if (status < 0) { if (status < 0) {
if (status != -ENODEV && printk_ratelimit()) if (status != -ENODEV &&
dev_err(&port_dev->dev, port1 != unreliable_port &&
"connect-debounce failed\n"); printk_ratelimit())
dev_err(&udev->dev, "connect-debounce failed, port %d disabled\n",
port1);
portstatus &= ~USB_PORT_STAT_CONNECTION; portstatus &= ~USB_PORT_STAT_CONNECTION;
unreliable_port = port1;
} else { } else {
portstatus = status; portstatus = status;
} }