Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77b84767 authored by Felipe Balbi's avatar Felipe Balbi Committed by Sarah Sharp
Browse files

usb: host: xhci: move HC_STATE_SUSPENDED check to xhci_suspend() 



that check will have to be done by all users
of xhci_suspend() so it sounds a lot better to
move the check to xhci_suspend() in order to
avoid code duplication.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
parent b0e4e606

drivers/usb/host/xhci-pci.c

+1 −8
Original line number Diff line number Diff line
@@ -221,15 +221,8 @@ static void xhci_pci_remove(struct pci_dev *dev) 
static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)

{

	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);

	int	retval = 0;



	if (hcd->state != HC_STATE_SUSPENDED ||

			xhci->shared_hcd->state != HC_STATE_SUSPENDED)

		return -EINVAL;



	retval = xhci_suspend(xhci);



	return retval;

	return xhci_suspend(xhci);

}



static int xhci_pci_resume(struct usb_hcd *hcd, bool hibernated)

drivers/usb/host/xhci.c

+4 −0
Original line number Diff line number Diff line
@@ -880,6 +880,10 @@ int xhci_suspend(struct xhci_hcd *xhci) 
	struct usb_hcd		*hcd = xhci_to_hcd(xhci);

	u32			command;



	if (hcd->state != HC_STATE_SUSPENDED ||

			xhci->shared_hcd->state != HC_STATE_SUSPENDED)

		return -EINVAL;



	spin_lock_irq(&xhci->lock);

	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);

	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags);