aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-09-15 14:07:02 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-09-15 14:07:02 -0700
commit705af30005886801aa23f8527b00d7de46eab140 (patch)
tree22c81995db058f11988214f7e2c30acd0cace3ea
parent364a72d8245dd3c789878a9b050008c63127b5d2 (diff)
downloadpatches-705af30005886801aa23f8527b00d7de46eab140.tar.gz
usb patch added
-rw-r--r--series1
-rw-r--r--usb/usb-reset_resume-needs-to-block-autosuspend-when-remote-wakeup-is-needed.patch33
2 files changed, 34 insertions, 0 deletions
diff --git a/series b/series
index 20f6e85dec4098..67cd2e8517a0fe 100644
--- a/series
+++ b/series
@@ -152,6 +152,7 @@ usb/ohci-allow-broken-controllers-to-auto-stop.patch
usb/usb-documentation-usb-anchors.txt-2.patch
usb/usb-core-fix-usb_otg_blacklist_hub-typo.patch
usb/usb-ftdi_sio-fix-product-parameter-description.patch
+usb/usb-reset_resume-needs-to-block-autosuspend-when-remote-wakeup-is-needed.patch
usb/fsl_usb2_udc-make-dr_ep_setup-function-static.patch
usb/fsl_usb2_udc-remove-check-for-udc-null-in-dr_controller_setup.patch
diff --git a/usb/usb-reset_resume-needs-to-block-autosuspend-when-remote-wakeup-is-needed.patch b/usb/usb-reset_resume-needs-to-block-autosuspend-when-remote-wakeup-is-needed.patch
new file mode 100644
index 00000000000000..7a6ed9ddbdbae8
--- /dev/null
+++ b/usb/usb-reset_resume-needs-to-block-autosuspend-when-remote-wakeup-is-needed.patch
@@ -0,0 +1,33 @@
+From oliver@neukum.org Mon Sep 15 14:03:13 2008
+From: Oliver Neukum <oliver@neukum.org>
+Date: Mon, 15 Sep 2008 17:29:28 +0200
+Subject: USB: RESET_RESUME needs to block autosuspend when remote wakeup is needed
+To: Alan Stern <stern@rowland.harvard.edu>
+Cc: linux-usb@vger.kernel.org, greg@kroah.com
+Message-ID: <200809151729.28639.oliver@neukum.org>
+Content-Disposition: inline
+
+
+Reset upon resumption will wipe the input buffer and is therefore
+a reason to not suspend if remote wakeup is requested because
+the driver needs that data.
+
+Signed-off-by: Oliver Neukum <oneukum@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/core/driver.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/usb/core/driver.c
++++ b/drivers/usb/core/driver.c
+@@ -1070,7 +1070,8 @@ static int autosuspend_check(struct usb_
+ struct usb_driver *driver;
+
+ driver = to_usb_driver(intf->dev.driver);
+- if (!driver->reset_resume)
++ if (!driver->reset_resume ||
++ intf->needs_remote_wakeup)
+ return -EOPNOTSUPP;
+ }
+ }