From 81c6a9ed526cd0f5206f3d11a704ce28ee86133c Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Mon, 10 Dec 2012 15:43:08 -0800 Subject: [PATCH] --- yaml --- r: 354547 b: refs/heads/master c: c2f60db740f2935a5e8a348298b590f2462e952f h: refs/heads/master i: 354545: d8c5c78bd8800fbf5894e78e77edf9b0f3db6ab7 354543: 4e6f6ee558ca4600fcb4ec7c19de3d1e4067dcad v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/hub.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 025c6eb6047b..70f93e04154b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3b9d7a9051d7024a93c76a84b2f84b3b66ad6d5 +refs/heads/master: c2f60db740f2935a5e8a348298b590f2462e952f diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c index b00f10956b00..be976ee84b8e 100644 --- a/trunk/drivers/usb/core/hub.c +++ b/trunk/drivers/usb/core/hub.c @@ -2946,9 +2946,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg) /* see 7.1.7.6 */ if (hub_is_superspeed(hub->hdev)) - status = set_port_feature(hub->hdev, - port1 | (USB_SS_PORT_LS_U3 << 3), - USB_PORT_FEAT_LINK_STATE); + status = hub_set_port_link_state(hub, port1, USB_SS_PORT_LS_U3); else status = set_port_feature(hub->hdev, port1, USB_PORT_FEAT_SUSPEND); @@ -3118,9 +3116,7 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg) /* see 7.1.7.7; affects power usage, but not budgeting */ if (hub_is_superspeed(hub->hdev)) - status = set_port_feature(hub->hdev, - port1 | (USB_SS_PORT_LS_U0 << 3), - USB_PORT_FEAT_LINK_STATE); + status = hub_set_port_link_state(hub, port1, USB_SS_PORT_LS_U0); else status = clear_port_feature(hub->hdev, port1, USB_PORT_FEAT_SUSPEND);