lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: hub: handle claim of enabled remote wakeup after reset

Browse Source 
Some touchscreens have buggy firmware which claims
remote wakeup to be enabled after a reset. They nevertheless
crash if the feature is cleared by the host.
Add a check for reset resume before checking for
an enabled remote wakeup feature. On compliant
devices the feature must be cleared after a reset anyway.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oliver Neukum
2012-11-29 15:05:57 +01:00
committed by Greg Kroah-Hartman
parent 036915a7a4
commit 07e72b95f5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3000,7 +3000,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
static int finish_port_resume(struct usb_device *udev) static int finish_port_resume(struct usb_device *udev)
{ {
int status = 0; int status = 0;
u16 devstatus; u16 devstatus = 0;
/* caller owns the udev device lock */ /* caller owns the udev device lock */
dev_dbg(&udev->dev, "%s\n", dev_dbg(&udev->dev, "%s\n",
@@ -3045,7 +3045,13 @@ static int finish_port_resume(struct usb_device *udev)
if (status) { if (status) {
dev_dbg(&udev->dev, "gone after usb resume? status %d\n", dev_dbg(&udev->dev, "gone after usb resume? status %d\n",
status); status);
} else if (udev->actconfig) { /*
* There are a few quirky devices which violate the standard
* by claiming to have remote wakeup enabled after a reset,
* which crash if the feature is cleared, hence check for
* udev->reset_resume
*/
} else if (udev->actconfig && !udev->reset_resume) {
le16_to_cpus(&devstatus); le16_to_cpus(&devstatus);
if (devstatus & (1 << USB_DEVICE_REMOTE_WAKEUP)) { if (devstatus & (1 << USB_DEVICE_REMOTE_WAKEUP)) {
status = usb_control_msg(udev, status = usb_control_msg(udev,