mirror of https://gitee.com/openkylin/linux.git
usbcore: Fix wrong device in an error message in hub_port_connect()
The commit [5ee0f803cc3a: usbcore: don't log on consecutive debounce failures of the same port] added the check of the reliable port, but it also replaced the device argument to dev_err() wrongly, which leads to a NULL dereference. This patch restores the right device, port_dev->dev. Also, since dev_err() itself shows the port number, reduce the port number shown in the error message, essentially reverting to the state before the commit5ee0f803cc
. [The fix suggested by Hannes, and the error message cleanup suggested by Alan Stern] Fixes:5ee0f803cc
('usbcore: don't log on consecutive debounce failures of the same port') Reported-by: Hannes Reinecke <hare@suse.com> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
7d1311b93e
commit
dd5f5006d1
|
@ -4631,9 +4631,7 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
|
|||
if (status != -ENODEV &&
|
||||
port1 != unreliable_port &&
|
||||
printk_ratelimit())
|
||||
dev_err(&udev->dev, "connect-debounce failed, port %d disabled\n",
|
||||
port1);
|
||||
|
||||
dev_err(&port_dev->dev, "connect-debounce failed\n");
|
||||
portstatus &= ~USB_PORT_STAT_CONNECTION;
|
||||
unreliable_port = port1;
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue