diff options
| author | Oliver Neukum <oliver@neukum.org> | 2012-11-29 15:05:57 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-02-06 04:33:31 +0000 |
| commit | 61c1cdc4b8f0789e93bfb835e69b351412762af1 (patch) | |
| tree | 0442bcb164346cdaa3e401f0ca82ebdbb5b86db5 /drivers/usb/core | |
| parent | 011321db1cb95b2c8917c280c151b6b89bd6b8c6 (diff) | |
| download | kernel_samsung_smdk4412-61c1cdc4b8f0789e93bfb835e69b351412762af1.zip kernel_samsung_smdk4412-61c1cdc4b8f0789e93bfb835e69b351412762af1.tar.gz kernel_samsung_smdk4412-61c1cdc4b8f0789e93bfb835e69b351412762af1.tar.bz2 | |
USB: hub: handle claim of enabled remote wakeup after reset
commit 07e72b95f5038cc82304b9a4a2eb7f9fc391ea68 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/hub.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 5975833..0ff8e9a 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -2530,7 +2530,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg) static int finish_port_resume(struct usb_device *udev) { int status = 0; - u16 devstatus; + u16 devstatus = 0; /* caller owns the udev device lock */ dev_dbg(&udev->dev, "%s\n", @@ -2575,7 +2575,13 @@ static int finish_port_resume(struct usb_device *udev) if (status) { dev_dbg(&udev->dev, "gone after usb resume? status %d\n", 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); if (devstatus & (1 << USB_DEVICE_REMOTE_WAKEUP)) { status = usb_control_msg(udev, |