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

Commit d4ae47dc authored by Florian Fainelli's avatar Florian Fainelli Committed by Greg Kroah-Hartman
Browse files

USB: ohci: remove check for RH already suspended in ohci_suspend 



As suggested by Alan Stern, the code checking for the OHCI RH already
suspended is no longer required since the bug it fixes has not been seen in
ages. Remove that check making ohci_suspend much simpler.

Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cd1965db

drivers/usb/host/ohci-hcd.c

+2 −9
Original line number Diff line number Diff line
@@ -1017,26 +1017,19 @@ static int __maybe_unused ohci_suspend(struct usb_hcd *hcd, bool do_wakeup) 
{

	struct ohci_hcd	*ohci = hcd_to_ohci (hcd);

	unsigned long	flags;

	int		rc = 0;



	/* Root hub was already suspended. Disable irq emission and

	 * mark HW unaccessible, bail out if RH has been resumed. Use

	/* Disable irq emission and mark HW unaccessible. Use

	 * the spinlock to properly synchronize with possible pending

	 * RH suspend or resume activity.

	 */

	spin_lock_irqsave (&ohci->lock, flags);

	if (ohci->rh_state != OHCI_RH_SUSPENDED) {

		rc = -EINVAL;

		goto bail;

	}

	ohci_writel(ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable);

	(void)ohci_readl(ohci, &ohci->regs->intrdisable);



	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);

 bail:

	spin_unlock_irqrestore (&ohci->lock, flags);



	return rc;

	return 0;

}