mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
usb: xhci: set SSIC port unused only if xhci_suspend succeeds
XHCI_SSIC_PORT_UNUSED quirk was applied to the xHCI host controllers in some Intel SoC chips. With this quirk applied, SSIC port is set to "unused" prior to xhci_suspend(). This may cause problem if host fails to suspend. In this case, the port is set to unused without host further entering D3, and the port will not be usable anymore. Cc: stable@vger.kernel.org Signed-off-by: Zhuang Jin Can <jin.can.zhuang@intel.com> Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
7e70cbffe2
commit
92149c930c
1 changed files with 6 additions and 1 deletions
|
@ -370,6 +370,7 @@ static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)
|
|||
{
|
||||
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
|
||||
struct pci_dev *pdev = to_pci_dev(hcd->self.controller);
|
||||
int ret;
|
||||
|
||||
/*
|
||||
* Systems with the TI redriver that loses port status change events
|
||||
|
@ -384,7 +385,11 @@ static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)
|
|||
if (xhci->quirks & XHCI_SSIC_PORT_UNUSED)
|
||||
xhci_ssic_port_unused_quirk(hcd, true);
|
||||
|
||||
return xhci_suspend(xhci, do_wakeup);
|
||||
ret = xhci_suspend(xhci, do_wakeup);
|
||||
if (ret && (xhci->quirks & XHCI_SSIC_PORT_UNUSED))
|
||||
xhci_ssic_port_unused_quirk(hcd, false);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int xhci_pci_resume(struct usb_hcd *hcd, bool hibernated)
|
||||
|
|
Loading…
Reference in a new issue