From: Yonglong Wu Date: Fri, 19 Aug 2016 03:37:26 +0000 (+0800) Subject: usb: hub: change CLEAR_FEATURE to SET_FEATURE X-Git-Tag: v3.12.67~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caba5960bdb0bae8b432e3664e425b2b53631771;p=thirdparty%2Fkernel%2Fstable.git usb: hub: change CLEAR_FEATURE to SET_FEATURE commit 4e248000e0d3b406bd6612186835467f2f84486e upstream. In USB20 specification, describes in chapter 9.4.5: The Remote Wakeup field can be modified by the SetFeature() and ClearFeature() requests using the DEVICE_REMOTE_WAKEUP feature selector. In USB30 specification, also describes in chapter 9.4.5: The Function Remote Wakeup field can be modified by the SetFeature() requests using the FUNCTION_SUSPEND feature selector. In chapter 9.4.9 Set Feature reference, it describes Function Remote Wake Enabled/Disabled at suspend options by SET_FEATURE. In USB30 specification only mentioned SetFeature(), so we need use SET_FEATURE replace CLEAR_FEATURE to disable USB30 function remote wakeup in suspend options. Signed-off-by: Yonglong Wu Signed-off-by: Greg Kroah-Hartman Signed-off-by: Jiri Slaby --- diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 0fb8c85b77bf0..5e788077675bc 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -2929,7 +2929,7 @@ static int usb_disable_remote_wakeup(struct usb_device *udev) USB_CTRL_SET_TIMEOUT); else return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), - USB_REQ_CLEAR_FEATURE, USB_RECIP_INTERFACE, + USB_REQ_SET_FEATURE, USB_RECIP_INTERFACE, USB_INTRF_FUNC_SUSPEND, 0, NULL, 0, USB_CTRL_SET_TIMEOUT); }