From a575ead3ed262729765226f4f5acd8ae27cfd8a1 Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oliver@neukum.org>
Date: Thu, 29 Nov 2012 15:05:57 +0100
Subject: [PATCH] --- yaml --- r: 348695 b: refs/heads/master c:
 07e72b95f5038cc82304b9a4a2eb7f9fc391ea68 h: refs/heads/master i:   348693:
 befe273d488d7e56307a9af316fbe8b969fc73be   348691:
 101614fa303f6fc40193c4404a7c776d2f03d425   348687:
 eeb35af784cb2cd590bf7ec7446265bd652581c5 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/usb/core/hub.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8b68cf2eed24..bcff5d82f2dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 036915a7a402753c05b8d0529f5fd08805ab46d0
+refs/heads/master: 07e72b95f5038cc82304b9a4a2eb7f9fc391ea68
diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c
index 9641e9c1dec5..957ed2c41482 100644
--- a/trunk/drivers/usb/core/hub.c
+++ b/trunk/drivers/usb/core/hub.c
@@ -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)
 {
 	int	status = 0;
-	u16	devstatus;
+	u16	devstatus = 0;
 
 	/* caller owns the udev device lock */
 	dev_dbg(&udev->dev, "%s\n",
@@ -3045,7 +3045,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,