Here's the patch:
------------------------------------------------------
--- usb-2.6.orig/drivers/usb/core/driver.c
+++ usb-2.6/drivers/usb/core/driver.c
@@ -1541,14 +1541,11 @@ static int usb_resume(struct device *dev
udev = to_usb_device(dev);
/* If udev->skip_sys_resume is set then udev was already suspended
- * when the system suspend started, so we don't want to resume
- * udev during this system wakeup. However a reset-resume counts
- * as a wakeup event, so allow a reset-resume to occur if remote
- * wakeup is enabled. */
- if (udev->skip_sys_resume) {
- if (!(udev->reset_resume && udev->do_remote_wakeup))
- return -EHOSTUNREACH;
- }
+ * when the system suspend started, so we don't want to resume it
+ * during this system wakeup.
+ */
+ if (udev->skip_sys_resume)
+ return 0;
return usb_external_resume_device(udev);
}
------------------------------------------------------
And here's the output from checkpatch.pl:
------------------------------------------------------
ERROR: space prohibited after that '*' (ctx:ExW)
#15: FILE: drivers/usb/core/driver.c:1544:
+ * when the system suspend started, so we don't want to resume it
^
ERROR: Missing Signed-off-by: line(s)
total: 2 errors, 0 warnings, 19 lines checked
/tmp/t has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
------------------------------------------------------
Alan Stern
--
