|
@@ -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,
|