aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/host/xhci.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 5156b720a53a..b4aa79d154b2 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -417,9 +417,9 @@ static void compliance_mode_recovery(unsigned long arg)
417 * Compliance Mode Detected. Letting USB Core 417 * Compliance Mode Detected. Letting USB Core
418 * handle the Warm Reset 418 * handle the Warm Reset
419 */ 419 */
420 xhci_dbg(xhci, "Compliance Mode Detected->Port %d!\n", 420 xhci_dbg(xhci, "Compliance mode detected->port %d\n",
421 i + 1); 421 i + 1);
422 xhci_dbg(xhci, "Attempting Recovery routine!\n"); 422 xhci_dbg(xhci, "Attempting compliance mode recovery\n");
423 hcd = xhci->shared_hcd; 423 hcd = xhci->shared_hcd;
424 424
425 if (hcd->state == HC_STATE_SUSPENDED) 425 if (hcd->state == HC_STATE_SUSPENDED)
@@ -457,7 +457,7 @@ static void compliance_mode_recovery_timer_init(struct xhci_hcd *xhci)
457 set_timer_slack(&xhci->comp_mode_recovery_timer, 457 set_timer_slack(&xhci->comp_mode_recovery_timer,
458 msecs_to_jiffies(COMP_MODE_RCVRY_MSECS)); 458 msecs_to_jiffies(COMP_MODE_RCVRY_MSECS));
459 add_timer(&xhci->comp_mode_recovery_timer); 459 add_timer(&xhci->comp_mode_recovery_timer);
460 xhci_dbg(xhci, "Compliance Mode Recovery Timer Initialized.\n"); 460 xhci_dbg(xhci, "Compliance mode recovery timer initialized\n");
461} 461}
462 462
463/* 463/*
@@ -733,8 +733,11 @@ void xhci_stop(struct usb_hcd *hcd)
733 733
734 /* Deleting Compliance Mode Recovery Timer */ 734 /* Deleting Compliance Mode Recovery Timer */
735 if ((xhci->quirks & XHCI_COMP_MODE_QUIRK) && 735 if ((xhci->quirks & XHCI_COMP_MODE_QUIRK) &&
736 (!(xhci_all_ports_seen_u0(xhci)))) 736 (!(xhci_all_ports_seen_u0(xhci)))) {
737 del_timer_sync(&xhci->comp_mode_recovery_timer); 737 del_timer_sync(&xhci->comp_mode_recovery_timer);
738 xhci_dbg(xhci, "%s: compliance mode recovery timer deleted\n",
739 __func__);
740 }
738 741
739 if (xhci->quirks & XHCI_AMD_PLL_FIX) 742 if (xhci->quirks & XHCI_AMD_PLL_FIX)
740 usb_amd_dev_put(); 743 usb_amd_dev_put();
@@ -930,7 +933,8 @@ int xhci_suspend(struct xhci_hcd *xhci)
930 if ((xhci->quirks & XHCI_COMP_MODE_QUIRK) && 933 if ((xhci->quirks & XHCI_COMP_MODE_QUIRK) &&
931 (!(xhci_all_ports_seen_u0(xhci)))) { 934 (!(xhci_all_ports_seen_u0(xhci)))) {
932 del_timer_sync(&xhci->comp_mode_recovery_timer); 935 del_timer_sync(&xhci->comp_mode_recovery_timer);
933 xhci_dbg(xhci, "Compliance Mode Recovery Timer Deleted!\n"); 936 xhci_dbg(xhci, "%s: compliance mode recovery timer deleted\n",
937 __func__);
934 } 938 }
935 939
936 /* step 5: remove core well power */ 940 /* step 5: remove core well power */