diff options
| author |   Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2012-12-10 15:43:08 -0800 |
|---|---|---|
| committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2013-01-03 14:10:36 -0800 |
| commit | c2f60db740f2935a5e8a348298b590f2462e952f (patch) | |
| tree | 3ac76cffef46ff6f72e2708f7f26b9f6d5f32d59 /drivers/usb/core | |
| parent | USB: Fix connected device switch to Inactive state. (diff) | |
| download | linux-dev-c2f60db740f2935a5e8a348298b590f2462e952f.tar.xz linux-dev-c2f60db740f2935a5e8a348298b590f2462e952f.zip | |
USB: Use helper function hub_set_port_link_state
Change the code that manually issues a Set Port Feature(Link State) to
use the new helper function hub_set_port_link_state().
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/hub.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index b00f10956b00..be976ee84b8e 100644 --- a/drivers/usb/core/hub.c +++ b/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); |