aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/xhci.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/host/xhci.c')
-rw-r--r--drivers/usb/host/xhci.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 349d3460a17a..49b6edb84a79 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3557,7 +3557,6 @@ void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
3557{ 3557{
3558 struct xhci_hcd *xhci = hcd_to_xhci(hcd); 3558 struct xhci_hcd *xhci = hcd_to_xhci(hcd);
3559 struct xhci_virt_device *virt_dev; 3559 struct xhci_virt_device *virt_dev;
3560 struct device *dev = hcd->self.controller;
3561 unsigned long flags; 3560 unsigned long flags;
3562 u32 state; 3561 u32 state;
3563 int i, ret; 3562 int i, ret;
@@ -3569,7 +3568,7 @@ void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
3569 * if no devices remain. 3568 * if no devices remain.
3570 */ 3569 */
3571 if (xhci->quirks & XHCI_RESET_ON_RESUME) 3570 if (xhci->quirks & XHCI_RESET_ON_RESUME)
3572 pm_runtime_put_noidle(dev); 3571 pm_runtime_put_noidle(hcd->self.controller);
3573#endif 3572#endif
3574 3573
3575 ret = xhci_check_args(hcd, udev, NULL, 0, true, __func__); 3574 ret = xhci_check_args(hcd, udev, NULL, 0, true, __func__);
@@ -3645,7 +3644,6 @@ static int xhci_reserve_host_control_ep_resources(struct xhci_hcd *xhci)
3645int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev) 3644int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
3646{ 3645{
3647 struct xhci_hcd *xhci = hcd_to_xhci(hcd); 3646 struct xhci_hcd *xhci = hcd_to_xhci(hcd);
3648 struct device *dev = hcd->self.controller;
3649 unsigned long flags; 3647 unsigned long flags;
3650 int timeleft; 3648 int timeleft;
3651 int ret; 3649 int ret;
@@ -3705,7 +3703,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
3705 * suspend if there is a device attached. 3703 * suspend if there is a device attached.
3706 */ 3704 */
3707 if (xhci->quirks & XHCI_RESET_ON_RESUME) 3705 if (xhci->quirks & XHCI_RESET_ON_RESUME)
3708 pm_runtime_get_noresume(dev); 3706 pm_runtime_get_noresume(hcd->self.controller);
3709#endif 3707#endif
3710 3708
3711 /* Is this a LS or FS device under a HS hub? */ 3709 /* Is this a LS or FS device under a HS hub? */